MS_06.01.2015

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

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)

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
 
 

app/DD-Record-Organiser/DD-Record-Organiser.vbproj

@@ -90,7 +90,8 @@
       <SpecificVersion>False</SpecificVersion>
       <Private>True</Private>
     </Reference>
-    <Reference Include="DevExpress.Printing.v14.2.Core, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Pdf.v15.1.Core, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Pdf.v15.1.Drawing, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Printing.v15.1.Core, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>True</Private>
@@ -123,6 +124,7 @@
       <SpecificVersion>False</SpecificVersion>
       <Private>True</Private>
     </Reference>
+    <Reference Include="DevExpress.XtraPdfViewer.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraPrinting.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>True</Private>
@@ -386,6 +388,12 @@
     <Compile Include="frmRecord_Changes.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="frmScanFiles.Designer.vb">
+      <DependentUpon>frmScanFiles.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmScanFiles.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmSplash.Designer.vb">
       <DependentUpon>frmSplash.vb</DependentUpon>
     </Compile>
@@ -622,6 +630,9 @@
     <EmbeddedResource Include="frmRecord_Changes.resx">
       <DependentUpon>frmRecord_Changes.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmScanFiles.resx">
+      <DependentUpon>frmScanFiles.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmSplash.resx">
       <DependentUpon>frmSplash.vb</DependentUpon>
     </EmbeddedResource>
@@ -1006,6 +1017,8 @@
     <None Include="Resources\brick.png" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\magifier_zoom_out.png" />
+    <None Include="Resources\page_red.png" />
     <None Include="Resources\key_go1.png" />
     <None Include="Resources\keinbild.png" />
     <None Include="Resources\page_white_office1.png" />

app/DD-Record-Organiser/My Project/Resources.Designer.vb

@@ -1100,6 +1100,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        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
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -1230,6 +1240,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        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
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>

app/DD-Record-Organiser/My Project/Resources.resx

@@ -172,9 +172,6 @@
   <data name="database_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="key_go1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\key_go1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="add" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -199,6 +196,9 @@
   <data name="GroupBox_680" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\GroupBox_680.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="bell_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bell_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="checkbox_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checkbox_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -295,9 +295,6 @@
   <data name="arrow_refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Works Finished (nonXP)" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Works Finished (nonXP).ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="lightbulb" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\lightbulb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -310,8 +307,8 @@
   <data name="arrow_Forward_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow_Forward_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="view_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="005_Task_32x42_72" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\view_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\005_Task_32x42_72.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="module_32xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\module_32xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -319,8 +316,8 @@
   <data name="Property_501" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Property_501.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="005_Task_32x42_72" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Works Finished (nonXP)" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\005_Task_32x42_72.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Works Finished (nonXP).ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="shield_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\shield_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -340,8 +337,8 @@
   <data name="calendar_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\calendar_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="handdrawn_arrow_right_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="key_go1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\handdrawn_arrow_right_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\key_go1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="database_lightning" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database_lightning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -388,8 +385,8 @@
   <data name="ico858" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ico858.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="database_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="view_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\database_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\view_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="txt" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\txt.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -424,6 +421,9 @@
   <data name="cancel" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="handdrawn_arrow_right_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\handdrawn_arrow_right_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="Excel_25ixel" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Excel_25ixel.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -472,6 +472,15 @@
   <data name="folder_Open_32xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder_Open_32xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Men5" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Men5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="page_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\page_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="bell_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="f3" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\f3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -535,8 +544,8 @@
   <data name="138_PushPin_32x42_72" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\138_PushPin_32x42_721.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Men5" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="database_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Men5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\database_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="database_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -553,10 +562,7 @@
   <data name="action_Cancel_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\action_Cancel_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="bell_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="magifier_zoom_out" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="bell_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bell_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

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

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)
+            Dim sql = "select count(*) from VWPMO_DOKUMENTTYPES where FORMVIEW_ID = " & CURRENT_FORMVIEW_ID
-            Check_Dropped_Files(act_FormViewID)
+            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)
+                    If DropType.ToString.Contains("SCAN") = False Then
-                    TBPMO_FILES_USERTableAdapter.cmdInsert(CURRENT_WORKFILE, Environment.UserName, DropType)
+                        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 sql = "select count(*) from VWPMO_DOKUMENTTYPES where FORMVIEW_ID = " & CURRENT_FORMVIEW_ID
-            Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
+            If ClassDatabase.Execute_Scalar(sql, True) >= 1 Then
-            If Not IsNothing(DT) 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)
-                If DT.Rows.Count > 0 Then
+                Dim DT As DataTable = ClassDatabase.Return_Datatable(sql1)
-                    For Each Filerow As DataRow In DT.Rows
+                If Not IsNothing(DT) Then
-                        'Dim datei = Str.ToString.Replace("@DROPFROMFSYSTEM@", "")
+                    If DT.Rows.Count > 0 Then
-                        CURRENT_FILEID = Filerow.Item(0)
+                        For Each Filerow As DataRow In DT.Rows
-                        frmWD_Index_Dokart.ShowDialog()
+                            'Dim datei = Str.ToString.Replace("@DROPFROMFSYSTEM@", "")
-                        RUN_WD_SEARCH(WD_Suche, "RECORD")
+                            CURRENT_FILEID = Filerow.Item(0)
-                    Next
+                            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

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

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