MS_19.10

2015-10-19 14:53:16 +02:00 · 2015-10-19 14:53:16 +02:00 · b228bae28a
commit b228bae28a
parent c74e5434b9
8 changed files with 111 additions and 48 deletions
--- a/app/DD-Record-Organiser/ClassDragDrop.vb
+++ b/app/DD-Record-Organiser/ClassDragDrop.vb
@ -81,6 +81,7 @@ Public Class ClassDragDrop
                        Console.WriteLine(">> Drop of a mailattachment - File")
                        ReDim Preserve files_dropped(0)
                        files_dropped(0) = "@OUTLOOK_ATTMNT@" & strOutFile
+                        TEMP_FILES.Add(strOutFile)
                        If LogErrorsOnly = False Then ClassLogger.Add(">> Drop an Attachment - File: " & strOutFile, False)
                        Return files_dropped
                    Else
@ -102,9 +103,9 @@ Public Class ClassDragDrop
                    'hardcode a destination path for testing
                    Dim strFile As String = IO.Path.Combine(Path.GetTempPath, (myobj.Subject + ".msg").Replace(":", ""))
                    myobj.SaveAs(strFile)
+                    TEMP_FILES.Add(strFile)
                    ReDim Preserve files_dropped(i)
                    files_dropped(i) = "@OUTLOOKMESSAGE@" & strFile
-
                Next
                Return files_dropped
            End If
--- a/app/DD-Record-Organiser/ModuleRuntimeVariables.vb
+++ b/app/DD-Record-Organiser/ModuleRuntimeVariables.vb
@ -34,4 +34,6 @@

    Public INTEGER1 As Integer
    Public STRING1 As String
+
+    Public TEMP_FILES As List(Of String) = New List(Of String)
 End Module
--- a/app/DD-Record-Organiser/frmForm_Constructor.vb
+++ b/app/DD-Record-Organiser/frmForm_Constructor.vb
@ -827,6 +827,7 @@ Public Class frmForm_Constructor
                End If
                'Die windream File zusammensetzen
                windream_temp_search = temppath & tempName & ".wdf"
+                TEMP_FILES.Add(windream_temp_search)
                'Die File schreiben
                My.Computer.FileSystem.WriteAllText(windream_temp_search, fileContents, False, EncodingFormat)
                My.Computer.FileSystem.WriteAllText(temppath & "SEARCH_COPY.wdf", fileContents, False, EncodingFormat)
@ -917,9 +918,6 @@ Public Class frmForm_Constructor
                Else
                    Clear_Windream_ResultList()
                End If
-                If My.Computer.FileSystem.FileExists(windream_temp_search) Then
-                    ' My.Computer.FileSystem.DeleteFile(windream_temp_search)
-                End If

            Catch ex As Exception
                MsgBox("Error in execute-windreamSearch:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
--- a/app/DD-Record-Organiser/frmForm_Input.vb
+++ b/app/DD-Record-Organiser/frmForm_Input.vb
@ -289,6 +289,7 @@ Public Class frmFormInput
                            ' XML-Datei öffnen und laden
                            xml.Load(newfilename)
                            xml.Save(newfilename)
+                            TEMP_FILES.Add(newfilename)
                            Dim windreamSucheErgebnisse As WMObjects = Me._windream.GetSearchDocuments(newfilename)
                            If Not IsNothing(windreamSucheErgebnisse) AndAlso windreamSucheErgebnisse.Count > 0 Then
                                AxObjectListControl.SetIconMode(True)
--- a/app/DD-Record-Organiser/frmLevel_Designer.Designer.vb
+++ b/app/DD-Record-Organiser/frmLevel_Designer.Designer.vb
@ -30,7 +30,6 @@ Partial Class frmLevel_Designer
        Me.lblFormName = New System.Windows.Forms.ToolStripLabel()
        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
        Me.grpbxDocumentView = New System.Windows.Forms.GroupBox()
-        Me.chkbxdocview = New System.Windows.Forms.CheckBox()
        Me.cmbSearchPattern5 = New System.Windows.Forms.ComboBox()
        Me.Label6 = New System.Windows.Forms.Label()
        Me.cmbSearchPattern4 = New System.Windows.Forms.ComboBox()
@ -45,6 +44,7 @@ Partial Class frmLevel_Designer
        Me.btnWindreamsuche = New System.Windows.Forms.Button()
        Me.txtWindreamsuche = New System.Windows.Forms.TextBox()
        Me.Label1 = New System.Windows.Forms.Label()
+        Me.chkbxdocview = New System.Windows.Forms.CheckBox()
        Me.OFDWindreamsuche = New System.Windows.Forms.OpenFileDialog()
        Me.ttTooltip = New System.Windows.Forms.ToolTip(Me.components)
        Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
@ -62,7 +62,7 @@ Partial Class frmLevel_Designer
        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsstatus})
        Me.StatusStrip1.Location = New System.Drawing.Point(0, 569)
        Me.StatusStrip1.Name = "StatusStrip1"
-        Me.StatusStrip1.Size = New System.Drawing.Size(1067, 22)
+        Me.StatusStrip1.Size = New System.Drawing.Size(1092, 22)
        Me.StatusStrip1.TabIndex = 0
        Me.StatusStrip1.Text = "StatusStrip1"
        '
@ -84,7 +84,7 @@ Partial Class frmLevel_Designer
        Me.pnlDesigner.Location = New System.Drawing.Point(0, 0)
        Me.pnlDesigner.Name = "pnlDesigner"
        Me.pnlDesigner.ShowGrid = True
-        Me.pnlDesigner.Size = New System.Drawing.Size(1067, 375)
+        Me.pnlDesigner.Size = New System.Drawing.Size(1092, 375)
        Me.pnlDesigner.TabIndex = 2
        '
        'ToolStrip1
@ -93,7 +93,7 @@ Partial Class frmLevel_Designer
        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.lblFormName, Me.ToolStripButton1})
        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
        Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(1067, 25)
+        Me.ToolStrip1.Size = New System.Drawing.Size(1092, 25)
        Me.ToolStrip1.TabIndex = 3
        Me.ToolStrip1.Text = "ToolStrip1"
        '
@ -114,8 +114,10 @@ Partial Class frmLevel_Designer
        '
        'grpbxDocumentView
        '
+        Me.grpbxDocumentView.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.grpbxDocumentView.BackColor = System.Drawing.SystemColors.Control
-        Me.grpbxDocumentView.Controls.Add(Me.chkbxdocview)
        Me.grpbxDocumentView.Controls.Add(Me.cmbSearchPattern5)
        Me.grpbxDocumentView.Controls.Add(Me.Label6)
        Me.grpbxDocumentView.Controls.Add(Me.cmbSearchPattern4)
@ -130,26 +132,14 @@ Partial Class frmLevel_Designer
        Me.grpbxDocumentView.Controls.Add(Me.btnWindreamsuche)
        Me.grpbxDocumentView.Controls.Add(Me.txtWindreamsuche)
        Me.grpbxDocumentView.Controls.Add(Me.Label1)
-        Me.grpbxDocumentView.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.grpbxDocumentView.Location = New System.Drawing.Point(0, 0)
+        Me.grpbxDocumentView.Location = New System.Drawing.Point(0, 11)
        Me.grpbxDocumentView.Name = "grpbxDocumentView"
-        Me.grpbxDocumentView.Size = New System.Drawing.Size(1067, 170)
+        Me.grpbxDocumentView.Size = New System.Drawing.Size(1092, 176)
        Me.grpbxDocumentView.TabIndex = 4
        Me.grpbxDocumentView.TabStop = False
        Me.grpbxDocumentView.Text = "Document View - Eigenschaften"
        Me.grpbxDocumentView.Visible = False
        '
-        'chkbxdocview
-        '
-        Me.chkbxdocview.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.chkbxdocview.AutoSize = True
-        Me.chkbxdocview.Location = New System.Drawing.Point(900, 17)
-        Me.chkbxdocview.Name = "chkbxdocview"
-        Me.chkbxdocview.Size = New System.Drawing.Size(167, 17)
-        Me.chkbxdocview.TabIndex = 5
-        Me.chkbxdocview.Text = "Dokumenten-Ansicht aktiv?"
-        Me.chkbxdocview.UseVisualStyleBackColor = True
-        '
        'cmbSearchPattern5
        '
        Me.cmbSearchPattern5.FormattingEnabled = True
@ -245,7 +235,7 @@ Partial Class frmLevel_Designer
        Me.btnsavedocView.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.btnsavedocView.Image = Global.DD_Record_Organiser.My.Resources.Resources.database_save
        Me.btnsavedocView.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnsavedocView.Location = New System.Drawing.Point(975, 40)
+        Me.btnsavedocView.Location = New System.Drawing.Point(994, 30)
        Me.btnsavedocView.Name = "btnsavedocView"
        Me.btnsavedocView.Size = New System.Drawing.Size(86, 26)
        Me.btnsavedocView.TabIndex = 52
@ -281,6 +271,17 @@ Partial Class frmLevel_Designer
        Me.Label1.TabIndex = 0
        Me.Label1.Text = "windream-Suche:"
        '
+        'chkbxdocview
+        '
+        Me.chkbxdocview.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.chkbxdocview.AutoSize = True
+        Me.chkbxdocview.Location = New System.Drawing.Point(922, 10)
+        Me.chkbxdocview.Name = "chkbxdocview"
+        Me.chkbxdocview.Size = New System.Drawing.Size(167, 17)
+        Me.chkbxdocview.TabIndex = 5
+        Me.chkbxdocview.Text = "Dokumenten-Ansicht aktiv?"
+        Me.chkbxdocview.UseVisualStyleBackColor = True
+        '
        'OFDWindreamsuche
        '
        Me.OFDWindreamsuche.Filter = "windream-Suche|*.wdf|Alle Dateien|*.*"
@ -300,9 +301,10 @@ Partial Class frmLevel_Designer
        '
        'SplitContainer1.Panel2
        '
+        Me.SplitContainer1.Panel2.Controls.Add(Me.chkbxdocview)
        Me.SplitContainer1.Panel2.Controls.Add(Me.grpbxDocumentView)
        Me.SplitContainer1.Panel2MinSize = 170
-        Me.SplitContainer1.Size = New System.Drawing.Size(1067, 544)
+        Me.SplitContainer1.Size = New System.Drawing.Size(1092, 544)
        Me.SplitContainer1.SplitterDistance = 375
        Me.SplitContainer1.TabIndex = 5
        '
@ -311,7 +313,7 @@ Partial Class frmLevel_Designer
        Me.AllowDrop = True
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1067, 591)
+        Me.ClientSize = New System.Drawing.Size(1092, 591)
        Me.Controls.Add(Me.SplitContainer1)
        Me.Controls.Add(Me.ToolStrip1)
        Me.Controls.Add(Me.StatusStrip1)
@ -326,6 +328,7 @@ Partial Class frmLevel_Designer
        Me.grpbxDocumentView.PerformLayout()
        Me.SplitContainer1.Panel1.ResumeLayout(False)
        Me.SplitContainer1.Panel2.ResumeLayout(False)
+        Me.SplitContainer1.Panel2.PerformLayout()
        CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SplitContainer1.ResumeLayout(False)
        Me.ResumeLayout(False)
--- a/app/DD-Record-Organiser/frmLevel_Designer.resx
+++ b/app/DD-Record-Organiser/frmLevel_Designer.resx
@ -124,9 +124,9 @@
    <value>134, 17</value>
  </metadata>
  <metadata name="OFDWindreamsuche.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>297, 17</value>
+    <value>241, 17</value>
  </metadata>
  <metadata name="ttTooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>460, 17</value>
+    <value>404, 17</value>
  </metadata>
 </root>
--- a/app/DD-Record-Organiser/frmLevel_Designer.vb
+++ b/app/DD-Record-Organiser/frmLevel_Designer.vb
@ -10,7 +10,7 @@

    'Public Shared CtrlBuilder As ClassControlBuilder
 #End Region
-
+    Dim formloaded As Boolean = False
    Public Shared Function Instance() As frmLevel_Designer
        If _Instance Is Nothing OrElse _Instance.IsDisposed = True Then
            _Instance = New frmLevel_Designer
@ -36,15 +36,59 @@
                If DT.Rows.Count = 1 Then
                    If Not IsDBNull(DT.Rows(0).Item(0)) Then
                        txtWindreamsuche.Text = ClassHelper.CheckDBNull(DT.Rows(0).Item(0), "String")
-                        cmbSearchPattern1.SelectedIndex = cmbSearchPattern1.FindStringExact(ClassHelper.CheckDBNull(DT.Rows(0).Item(1), "String"))
-                        cmbSearchPattern2.SelectedIndex = cmbSearchPattern2.FindStringExact(ClassHelper.CheckDBNull(DT.Rows(0).Item(2), "String"))
-                        cmbSearchPattern3.SelectedIndex = cmbSearchPattern3.FindStringExact(ClassHelper.CheckDBNull(DT.Rows(0).Item(3), "String"))
-                        cmbSearchPattern4.SelectedIndex = cmbSearchPattern4.FindStringExact(ClassHelper.CheckDBNull(DT.Rows(0).Item(4), "String"))
-                        cmbSearchPattern5.SelectedIndex = cmbSearchPattern5.FindStringExact(ClassHelper.CheckDBNull(DT.Rows(0).Item(5), "String"))
+                        'Form-ID (Entity)
+                        'Record -ID
+                        Dim result
+                        result = ClassHelper.CheckDBNull(DT.Rows(0).Item(1), "String")
+                        If result <> "" Then
+                            If result.ToString.ToUpper.Contains("RECORD") Then
+                                cmbSearchPattern1.SelectedIndex = 1
+                            Else
+                                cmbSearchPattern1.SelectedIndex = 0
+                            End If
+                        End If
+                        result = ClassHelper.CheckDBNull(DT.Rows(0).Item(2), "String")
+                        If result <> "" Then
+                            If result.ToString.ToUpper.Contains("RECORD") Then
+                                cmbSearchPattern2.SelectedIndex = 1
+                            Else
+                                cmbSearchPattern2.SelectedIndex = 0
+                            End If
+                        End If
+                        result = ClassHelper.CheckDBNull(DT.Rows(0).Item(3), "String")
+                        If result <> "" Then
+                            If result.ToString.ToUpper.Contains("RECORD") Then
+                                cmbSearchPattern3.SelectedIndex = 1
+                            Else
+                                cmbSearchPattern3.SelectedIndex = 0
+                            End If
+                        End If
+                        result = ClassHelper.CheckDBNull(DT.Rows(0).Item(4), "String")
+                        If result <> "" Then
+                            If result.ToString.ToUpper.Contains("RECORD") Then
+                                cmbSearchPattern4.SelectedIndex = 1
+                            Else
+                                cmbSearchPattern4.SelectedIndex = 0
+                            End If
+                        End If
+                        result = ClassHelper.CheckDBNull(DT.Rows(0).Item(5), "String")
+                        If result <> "" Then
+                            If result.ToString.ToUpper.Contains("RECORD") Then
+                                cmbSearchPattern5.SelectedIndex = 1
+                            Else
+                                cmbSearchPattern5.SelectedIndex = 0
+                            End If
+                        End If
+                        'cmbSearchPattern1.SelectedIndex = cmbSearchPattern1.FindStringExact(ClassHelper.CheckDBNull("@" & DT.Rows(0).Item(1), "String"))
+                        'cmbSearchPattern2.SelectedIndex = cmbSearchPattern2.FindStringExact(ClassHelper.CheckDBNull("@" & DT.Rows(0).Item(2), "String"))
+                        'cmbSearchPattern3.SelectedIndex = cmbSearchPattern3.FindStringExact(ClassHelper.CheckDBNull("@" & DT.Rows(0).Item(3), "String"))
+                        'cmbSearchPattern4.SelectedIndex = cmbSearchPattern4.FindStringExact(ClassHelper.CheckDBNull("@" & DT.Rows(0).Item(4), "String"))
+                        'cmbSearchPattern5.SelectedIndex = cmbSearchPattern5.FindStringExact(ClassHelper.CheckDBNull("@" & DT.Rows(0).Item(5), "String"))
                    End If
                End If
                Me.grpbxDocumentView.Visible = True
            Else
+                chkbxdocview.Visible = True
                chkbxdocview.Checked = False
                Me.grpbxDocumentView.Visible = False
            End If
@ -602,27 +646,27 @@
        Try
            Dim SP1, SP2, SP3, SP4, SP5
            If cmbSearchPattern1.SelectedIndex <> -1 Then
-                SP1 = cmbSearchPattern1.Text
+                SP1 = "@" & cmbSearchPattern1.Text
            Else
                SP1 = ""
            End If
            If cmbSearchPattern2.SelectedIndex <> -1 Then
-                SP2 = cmbSearchPattern2.Text
+                SP2 = "@" & cmbSearchPattern2.Text
            Else
                SP2 = ""
            End If
            If cmbSearchPattern3.SelectedIndex <> -1 Then
-                SP3 = cmbSearchPattern3.Text
+                SP3 = "@" & cmbSearchPattern3.Text
            Else
                SP3 = ""
            End If
            If cmbSearchPattern4.SelectedIndex <> -1 Then
-                SP4 = cmbSearchPattern4.Text
+                SP4 = "@" & cmbSearchPattern4.Text
            Else
                SP4 = ""
            End If
            If cmbSearchPattern5.SelectedIndex <> -1 Then
-                SP5 = cmbSearchPattern5.Text
+                SP5 = "@" & cmbSearchPattern5.Text
            Else
                SP5 = ""
            End If
@ -640,17 +684,23 @@
    End Sub

    Private Sub chkbxdocview_CheckedChanged(sender As Object, e As EventArgs) Handles chkbxdocview.CheckedChanged
-        Dim sql
-        If chkbxdocview.Checked = True Then
-            sql = "UPDATE TBPMO_FORM_VIEW SET DOCUMENT_VIEW = 1, CHANGED_WHO = '" & Environment.UserName & "' WHERE FORM_ID = " & CURRENT_FORM_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID
-        Else
-            sql = "UPDATE TBPMO_FORM_VIEW SET DOCUMENT_VIEW = 0, CHANGED_WHO = '" & Environment.UserName & "' WHERE FORM_ID = " & CURRENT_FORM_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID
+        If formloaded = True Then
+            Dim sql
+            If chkbxdocview.Checked = True Then
+                sql = "UPDATE TBPMO_FORM_VIEW SET DOCUMENT_VIEW = 1, CHANGED_WHO = '" & Environment.UserName & "' WHERE FORM_ID = " & CURRENT_FORM_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID
+            Else
+                sql = "UPDATE TBPMO_FORM_VIEW SET DOCUMENT_VIEW = 0, CHANGED_WHO = '" & Environment.UserName & "' WHERE FORM_ID = " & CURRENT_FORM_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID
+            End If
+            If ClassDatabase.Execute_non_Query(sql) = False Then
+                MsgBox("Fehler bei Update Document-View - Check log", MsgBoxStyle.Critical)
+            End If
+            Check_Document_Config(CURRENT_FORM_ID)
        End If
-        If ClassDatabase.Execute_non_Query(sql) = False Then
-            MsgBox("Fehler bei Update Document-View - Check log", MsgBoxStyle.Critical)
-        End If
-        Check_Document_Config(CURRENT_FORM_ID)
+      
    End Sub


+    Private Sub frmLevel_Designer_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+        formloaded = True
+    End Sub
 End Class
--- a/app/DD-Record-Organiser/frmMain.vb
+++ b/app/DD-Record-Organiser/frmMain.vb
@ -27,6 +27,14 @@ Public Class frmMain

        Catch ex As Exception

+        End Try
+        'TempDateien löschen
+        Try
+            For Each _file In TEMP_FILES
+                System.IO.File.Delete(_file)
+            Next
+        Catch ex As Exception
+
        End Try
    End Sub