diff --git a/app/DD-Record-Organiser/ClassDragDrop.vb b/app/DD-Record-Organiser/ClassDragDrop.vb index ecb7c9d..65843e6 100644 --- a/app/DD-Record-Organiser/ClassDragDrop.vb +++ b/app/DD-Record-Organiser/ClassDragDrop.vb @@ -8,7 +8,7 @@ Public Class ClassDragDrop If LogErrorsOnly = False Then ClassLogger.Add(">> In Drop_File....", False) files_dropped = Nothing Dim oApp As New Outlook.Application - Dim sql As String = "DELETE FROM TBPMO_FILES_USER WHERE UPPER(USER_WORK) = UPPER('" & Environment.UserName & "')" + Dim sql As String = "DELETE FROM TBPMO_FILES_USER WHERE HANDLE_TYPE <> 'SCAN' AND UPPER(USER_WORK) = UPPER('" & Environment.UserName & "')" ClassDatabase.Execute_non_Query(sql) If e.Data.GetDataPresent(DataFormats.FileDrop) Then @@ -112,8 +112,12 @@ Public Class ClassDragDrop Catch ex As Exception MsgBox("Error in Drop_File: " & ex.Message, MsgBoxStyle.Critical) End Try - - + If e.Data.GetDataPresent(DataFormats.StringFormat) Then + Dim Wert As String = CType(e.Data.GetData(DataFormats.StringFormat), Object) + Console.WriteLine(Wert) + ReDim Preserve files_dropped(0) + files_dropped(0) = "@SCAN@" & Wert + End If 'Else ' Dim files() As String = e.Data.GetData(DataFormats.FileDrop) ' Dim filestype() As String @@ -156,7 +160,7 @@ Public Class ClassDragDrop If LogErrorsOnly = True Then ClassLogger.Add("DragEnter ... OutlookMessage", False) Else 'otherwise, do not handle - e.Effect = DragDropEffects.None + e.Effect = DragDropEffects.Copy frmForm_Constructor.tslblStatusMain_show(True, "DragEnter ... Other FileFormat") If LogErrorsOnly = True Then ClassLogger.Add("DragEnter ... Other FileFormat", False) End If diff --git a/app/DD-Record-Organiser/ClassFolderWatcher.vb b/app/DD-Record-Organiser/ClassFolderWatcher.vb index e48953a..512dd7c 100644 --- a/app/DD-Record-Organiser/ClassFolderWatcher.vb +++ b/app/DD-Record-Organiser/ClassFolderWatcher.vb @@ -72,9 +72,9 @@ Public Class ClassFolderWatcher Dim handleType As String If e.FullPath.EndsWith(".msg") Then - handleType = "@SCAN_OUTLOOK_MESSAGE@" + handleType = "SCAN_OUTLOOK_MESSAGE" Else - handleType = "@SCAN@" + handleType = "SCAN" End If 'Die Datei übergeben If LogErrorsOnly = False Then ClassLogger.Add(">> OnCreated-File:" & e.FullPath, False) @@ -105,7 +105,7 @@ Public Class ClassFolderWatcher Try Dim filename_only As String = Path.GetFileName(filename) - Dim ins As String = String.Format("INSERT INTO TBPMO_FILES_USER (FILENAME2WORK, USER@WORK,HANDLE_TYPE,FILENAME_ONLY) VALUES ('{0}','{1}','{2}','{3}')", filename, Environment.UserName, handleType, filename_only) + Dim ins As String = String.Format("INSERT INTO TBPMO_FILES_USER (FILENAME2WORK, USER_WORK,HANDLE_TYPE,FILENAME_ONLY) VALUES ('{0}','{1}','{2}','{3}')", filename, Environment.UserName, handleType, filename_only) Return ClassDatabase.Execute_non_Query(ins, True) Catch ex As Exception MsgBox("Unexpected Error in Insert Scan-File: " & ex.Message, MsgBoxStyle.Critical) diff --git a/app/DD-Record-Organiser/ClassInit.vb b/app/DD-Record-Organiser/ClassInit.vb index fa68132..25c7cd2 100644 --- a/app/DD-Record-Organiser/ClassInit.vb +++ b/app/DD-Record-Organiser/ClassInit.vb @@ -28,6 +28,7 @@ Public Class ClassInit If dbResult = False Then Throw New Exception("Find more information in the logfile.") End If + Return True Catch ex As Exception MsgBox("Unexpected Error in Init Database:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) Return False @@ -136,6 +137,23 @@ Public Class ClassInit ClassDatabase.Execute_non_Query(sql, True) ClassLogger.Add(" - Wieder abgemeldet", False) End If + Else + + Try + 'Die FolderWatch starten + Dim sql1 = "SELECT FOLDER_PATH FROM TBPMO_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & USER_GUID + Dim folderwatch_SCAN = ClassDatabase.Execute_Scalar(sql1, True) + + If Not folderwatch_SCAN Is Nothing Then + CURRENT_SCAN_FOLDERWATCH = folderwatch_SCAN + If FWSCAN_started = True Then + ClassFolderWatcher.StartStop_FolderWatchSCAN() + End If + End If + Catch ex As Exception + ClassLogger.Add("Unexpected Error in Init_Folderwatch: " & ex.Message, True) + End Try + End If diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index 8e5bc45..c288f1f 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -90,7 +90,8 @@ False True - + + False True @@ -123,6 +124,7 @@ False True + False True @@ -386,6 +388,12 @@ Form + + frmScanFiles.vb + + + Form + frmSplash.vb @@ -622,6 +630,9 @@ frmRecord_Changes.vb + + frmScanFiles.vb + frmSplash.vb @@ -1006,6 +1017,8 @@ + + diff --git a/app/DD-Record-Organiser/My Project/Resources.Designer.vb b/app/DD-Record-Organiser/My Project/Resources.Designer.vb index 1d300dc..b6ae4c4 100644 --- a/app/DD-Record-Organiser/My Project/Resources.Designer.vb +++ b/app/DD-Record-Organiser/My Project/Resources.Designer.vb @@ -1100,6 +1100,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property magifier_zoom_out() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("magifier_zoom_out", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1230,6 +1240,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property page_red() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("page_red", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/app/DD-Record-Organiser/My Project/Resources.resx b/app/DD-Record-Organiser/My Project/Resources.resx index 0974d65..3f4da95 100644 --- a/app/DD-Record-Organiser/My Project/Resources.resx +++ b/app/DD-Record-Organiser/My Project/Resources.resx @@ -172,9 +172,6 @@ ..\Resources\database_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\key_go1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -199,6 +196,9 @@ ..\Resources\GroupBox_680.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bell_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\checkbox_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -295,9 +295,6 @@ ..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Works Finished (nonXP).ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\lightbulb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -310,8 +307,8 @@ ..\Resources\arrow_Forward_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\view_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\005_Task_32x42_72.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\module_32xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -319,8 +316,8 @@ ..\Resources\Property_501.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\005_Task_32x42_72.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Works Finished (nonXP).ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\shield_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -340,8 +337,8 @@ ..\Resources\calendar_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\handdrawn_arrow_right_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\key_go1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\database_lightning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -388,8 +385,8 @@ ..\Resources\ico858.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\view_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\txt.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -424,6 +421,9 @@ ..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\handdrawn_arrow_right_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Excel_25ixel.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -472,6 +472,15 @@ ..\Resources\folder_Open_32xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Men5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\page_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\f3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -535,8 +544,8 @@ ..\Resources\138_PushPin_32x42_721.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Men5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\database_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -553,10 +562,7 @@ ..\Resources\action_Cancel_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\bell_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/app/DD-Record-Organiser/My Project/licenses.licx b/app/DD-Record-Organiser/My Project/licenses.licx index 41e1f2b..465efdf 100644 --- a/app/DD-Record-Organiser/My Project/licenses.licx +++ b/app/DD-Record-Organiser/My Project/licenses.licx @@ -1,6 +1,8 @@ -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb index 990c023..d144beb 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb @@ -2771,8 +2771,26 @@ Public Class frmForm_Constructor_Main_2 End Sub Sub Drag_Drop(e As DragEventArgs) If act_FormViewID <> 0 Then - ClassDragDrop.Drop_File(e) - Check_Dropped_Files(act_FormViewID) + Dim sql = "select count(*) from VWPMO_DOKUMENTTYPES where FORMVIEW_ID = " & CURRENT_FORMVIEW_ID + If ClassDatabase.Execute_Scalar(sql, True) = 0 Then + MsgBox("No documenttypes for this entity configured! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation) + Exit Sub + End If + If e.Data.GetDataPresent(DataFormats.StringFormat) Then + Dim Wert As String = CType(e.Data.GetData(DataFormats.StringFormat), Object) + Console.WriteLine(Wert) + If Wert.Contains("SCAN") Then + Dim split() = Wert.Split(";") + If IsNumeric(split(1)) Then + CURRENT_FILEID = split(1) + frmWD_Index_Dokart.ShowDialog() + RUN_WD_SEARCH(WD_Suche, "RECORD") + End If + End If + Else + ClassDragDrop.Drop_File(e) + Check_Dropped_Files(act_FormViewID) + End If End If End Sub Sub Check_Dropped_Files(FORMVIEW_ID As Integer) @@ -2784,26 +2802,33 @@ Public Class frmForm_Constructor_Main_2 CURRENT_FORMVIEW_ID = FORMVIEW_ID For Each Str As Object In ClassDragDrop.files_dropped If Not IsNothing(Str) Then - ClassLogger.Add(">> Check_Dropped_Files:" & Str.ToString, False) Dim DropType = Str.Substring(0, Str.LastIndexOf("@") + 1) - Dim CURRENT_WORKFILE = Str.Substring(Str.LastIndexOf("@") + 1) - TBPMO_FILES_USERTableAdapter.cmdInsert(CURRENT_WORKFILE, Environment.UserName, DropType) + If DropType.ToString.Contains("SCAN") = False Then + ClassLogger.Add(">> Check_Dropped_Files:" & Str.ToString, False) + Dim CURRENT_WORKFILE = Str.Substring(Str.LastIndexOf("@") + 1) + TBPMO_FILES_USERTableAdapter.cmdInsert(CURRENT_WORKFILE, Environment.UserName, DropType) + End If End If Next - Dim sql = String.Format("SELECT GUID, FILENAME2WORK, USER_WORK, HANDLE_TYPE, WORKED, ADDED_WHEN FROM TBPMO_FILES_USER WHERE (UPPER(USER_WORK) = UPPER('{0}')) AND WORKED = 0", Environment.UserName) - Dim DT As DataTable = ClassDatabase.Return_Datatable(sql) - If Not IsNothing(DT) Then - If DT.Rows.Count > 0 Then - For Each Filerow As DataRow In DT.Rows - 'Dim datei = Str.ToString.Replace("@DROPFROMFSYSTEM@", "") - CURRENT_FILEID = Filerow.Item(0) - frmWD_Index_Dokart.ShowDialog() - RUN_WD_SEARCH(WD_Suche, "RECORD") - Next + Dim sql = "select count(*) from VWPMO_DOKUMENTTYPES where FORMVIEW_ID = " & CURRENT_FORMVIEW_ID + If ClassDatabase.Execute_Scalar(sql, True) >= 1 Then + Dim sql1 = String.Format("SELECT GUID, FILENAME2WORK, USER_WORK, HANDLE_TYPE, WORKED, ADDED_WHEN FROM TBPMO_FILES_USER WHERE (UPPER(USER_WORK) = UPPER('{0}')) AND WORKED = 0", Environment.UserName) + Dim DT As DataTable = ClassDatabase.Return_Datatable(sql1) + If Not IsNothing(DT) Then + If DT.Rows.Count > 0 Then + For Each Filerow As DataRow In DT.Rows + 'Dim datei = Str.ToString.Replace("@DROPFROMFSYSTEM@", "") + CURRENT_FILEID = Filerow.Item(0) + frmWD_Index_Dokart.ShowDialog() + RUN_WD_SEARCH(WD_Suche, "RECORD") + Next + End If End If + Else + MsgBox("No documenttypes for this entity configured! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation) + Exit Sub End If - Catch ex As Exception MsgBox("Check_Dropped_Files: " & ex.Message, MsgBoxStyle.Critical) End Try diff --git a/app/DD-Record-Organiser/frmMain.vb b/app/DD-Record-Organiser/frmMain.vb index acde2a7..6bc76f5 100644 --- a/app/DD-Record-Organiser/frmMain.vb +++ b/app/DD-Record-Organiser/frmMain.vb @@ -45,6 +45,17 @@ Public Class frmMain LoadQuickStartItems() VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString + Try + Dim sql1 As String = String.Format("select * from TBPMO_FILES_USER where HANDLE_TYPE = 'SCAN' and WORKED = 0 AND UPPER(USER_WORK) = '{0}'", Environment.UserName) + Dim DT As DataTable = ClassDatabase.Return_Datatable(sql1, "Load ScanFiles") + If Not IsNothing(DT) Then + If DT.Rows.Count > 0 Then + frmScanFiles.Show() + End If + End If + Catch ex As Exception + MsgBox("Error in Load InBox Scan:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try End Sub Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing Try diff --git a/app/DD-Record-Organiser/frmWD_Index_Dokart.vb b/app/DD-Record-Organiser/frmWD_Index_Dokart.vb index 0908236..1676e3c 100644 --- a/app/DD-Record-Organiser/frmWD_Index_Dokart.vb +++ b/app/DD-Record-Organiser/frmWD_Index_Dokart.vb @@ -89,7 +89,7 @@ Public Class frmWD_Index_Dokart 'Die temporäre Datei löschen File.Delete(aktFiledropped) End If - ElseIf droptype = "@ATTMNTEXTRACTED@" And indexierung_erfolgreich = True Then + ElseIf (droptype = "@ATTMNTEXTRACTED@" Or droptype = "SCAN") And indexierung_erfolgreich = True Then 'Die temporäre Datei löschen File.Delete(aktFiledropped) ElseIf droptype = "dragdrop message" And indexierung_erfolgreich = True Then @@ -368,6 +368,8 @@ Public Class frmWD_Index_Dokart droptype = "dragdrop message" chkdelete_origin.Visible = True chkdelete_origin.Checked = WD_IndexDeleteDocs + ElseIf HandleType = "SCAM" Then + droptype = "scan" End If TBPMO_FILES_USERTableAdapter.Connection.ConnectionString = MyConnectionString VWPMO_DOKUMENTTYPESTableAdapter.Connection.ConnectionString = MyConnectionString