MS2

2016-05-25 16:53:42 +02:00
parent 48a12ca8c2
commit 6a20480e7c
7 changed files with 82 additions and 52 deletions
--- a/app/DD-Record-Organiser/frmConfig_Basic.vb
+++ b/app/DD-Record-Organiser/frmConfig_Basic.vb
@@ -252,6 +252,9 @@ Public Class frmConfig_Basic

    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
        Dim fbdialog As New FolderBrowserDialog
+        If txtScanFolderWatch.Text <> "" Then
+            fbdialog.SelectedPath = txtScanFolderWatch.Text
+        End If
        If fbdialog.ShowDialog() = DialogResult.OK Then
            CheckScanFolder(fbdialog.SelectedPath)
        End If
--- a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb
+++ b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb
@@ -444,6 +444,7 @@ Partial Class frmConstructorDesigner
        Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing
        Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = Me.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter
        Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTORTableAdapter = Me.TBPMO_FORM_CONSTRUCTORTableAdapter
+        Me.TableAdapterManager.TBPMO_SAP_FUBATableAdapter = Nothing
        Me.TableAdapterManager.UpdateOrder = DD_Record_Organiser.DD_ECMAdminTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
        '
        'TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter
@@ -1370,6 +1371,7 @@ Partial Class frmConstructorDesigner
        Me.TableAdapterManager1.TBDD_CONNECTIONTableAdapter = Nothing
        Me.TableAdapterManager1.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = Nothing
        Me.TableAdapterManager1.TBPMO_FORM_CONSTRUCTORTableAdapter = Me.TBPMO_FORM_CONSTRUCTORTableAdapter1
+        Me.TableAdapterManager1.TBPMO_SAP_FUBATableAdapter = Nothing
        Me.TableAdapterManager1.UpdateOrder = DD_Record_Organiser.DD_ECMAdminTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
        '
        'lblSave
--- a/app/DD-Record-Organiser/frmConstructorDesigner.resx
+++ b/app/DD-Record-Organiser/frmConstructorDesigner.resx
@@ -1279,7 +1279,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS
-        CQAAAk1TRnQBSQFMAgEBAgEAAbwBCwG8AQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAgEAAcQBCwHEAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -1328,7 +1328,7 @@
    <value>1</value>
  </data>
  <data name="TreeViewDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>292, 411</value>
+    <value>292, 408</value>
  </data>
  <data name="TreeViewDetails.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -1913,7 +1913,7 @@
    <value>21</value>
  </data>
  <data name="XtraTabPage3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1010, 339</value>
+    <value>1002, 333</value>
  </data>
  <data name="XtraTabPage3.Text" xml:space="preserve">
    <value>Allgemein</value>
@@ -1931,7 +1931,7 @@
    <value>1</value>
  </data>
  <data name="XtraTabControl2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1012, 364</value>
+    <value>1008, 361</value>
  </data>
  <data name="XtraTabControl2.TabIndex" type="System.Int32, mscorlib">
    <value>35</value>
@@ -2382,7 +2382,7 @@
    <value>13</value>
  </data>
  <data name="XtraTabPage5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1010, 339</value>
+    <value>1006, 336</value>
  </data>
  <data name="XtraTabPage5.Text" xml:space="preserve">
    <value>Quick View Konfiguration</value>
@@ -2853,7 +2853,7 @@
    <value>5, 24</value>
  </data>
  <data name="grpbxWD_RecordSearch.Size" type="System.Drawing.Size, System.Drawing">
-    <value>825, 157</value>
+    <value>821, 157</value>
  </data>
  <data name="grpbxWD_RecordSearch.TabIndex" type="System.Int32, mscorlib">
    <value>78</value>
@@ -3027,7 +3027,7 @@
    <value>5, 187</value>
  </data>
  <data name="GroupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>825, 148</value>
+    <value>821, 148</value>
  </data>
  <data name="GroupBox1.TabIndex" type="System.Int32, mscorlib">
    <value>44</value>
@@ -3048,7 +3048,7 @@
    <value>2</value>
  </data>
  <data name="XtraTabPage4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1010, 339</value>
+    <value>1002, 333</value>
  </data>
  <data name="XtraTabPage4.Text" xml:space="preserve">
    <value>windream-Suche Konfiguration</value>
@@ -3102,7 +3102,7 @@
    <value>102</value>
  </data>
  <data name="GridControlUserSQL.Size" type="System.Drawing.Size, System.Drawing">
-    <value>272, 280</value>
+    <value>272, 274</value>
  </data>
  <data name="GridControlUserSQL.TabIndex" type="System.Int32, mscorlib">
    <value>89</value>
@@ -3132,7 +3132,7 @@
    <value>NoControl</value>
  </data>
  <data name="Label12.Location" type="System.Drawing.Point, System.Drawing">
-    <value>283, 149</value>
+    <value>283, 143</value>
  </data>
  <data name="Label12.Size" type="System.Drawing.Size, System.Drawing">
    <value>132, 15</value>
@@ -3168,7 +3168,7 @@
    <value>NoControl</value>
  </data>
  <data name="Label17.Location" type="System.Drawing.Point, System.Drawing">
-    <value>536, 149</value>
+    <value>536, 143</value>
  </data>
  <data name="Label17.Size" type="System.Drawing.Size, System.Drawing">
    <value>55, 15</value>
@@ -3195,7 +3195,7 @@
    <value>Bottom, Left</value>
  </data>
  <data name="dgvResult.Location" type="System.Drawing.Point, System.Drawing">
-    <value>539, 167</value>
+    <value>539, 161</value>
  </data>
  <data name="dgvResult.Size" type="System.Drawing.Size, System.Drawing">
    <value>449, 140</value>
@@ -3234,7 +3234,7 @@
    <value>False</value>
  </data>
  <data name="dgvPlaceholders.Location" type="System.Drawing.Point, System.Drawing">
-    <value>287, 167</value>
+    <value>287, 161</value>
  </data>
  <data name="dgvPlaceholders.Size" type="System.Drawing.Size, System.Drawing">
    <value>246, 140</value>
@@ -3267,7 +3267,7 @@
    <value>NoControl</value>
  </data>
  <data name="btnTestSQL.Location" type="System.Drawing.Point, System.Drawing">
-    <value>733, 133</value>
+    <value>733, 127</value>
  </data>
  <data name="btnTestSQL.Size" type="System.Drawing.Size, System.Drawing">
    <value>255, 31</value>
@@ -3552,7 +3552,7 @@
    <value>3, 3, 3, 3</value>
  </data>
  <data name="TabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1002, 313</value>
+    <value>994, 307</value>
  </data>
  <data name="TabPage1.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -3579,7 +3579,7 @@
    <value>3, 3, 3, 3</value>
  </data>
  <data name="TabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1002, 313</value>
+    <value>994, 307</value>
  </data>
  <data name="TabPage2.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -3606,7 +3606,7 @@
    <value>0, 0</value>
  </data>
  <data name="TabControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1010, 339</value>
+    <value>1002, 333</value>
  </data>
  <data name="TabControl1.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -3624,7 +3624,7 @@
    <value>0</value>
  </data>
  <data name="XtraTabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1010, 339</value>
+    <value>1002, 333</value>
  </data>
  <data name="XtraTabPage2.Text" xml:space="preserve">
    <value>Einschränkungen User</value>
@@ -3711,7 +3711,7 @@
    <value>399, 24</value>
  </data>
  <data name="chklbxEntitiesforClient.Size" type="System.Drawing.Size, System.Drawing">
-    <value>192, 132</value>
+    <value>192, 116</value>
  </data>
  <data name="chklbxEntitiesforClient.TabIndex" type="System.Int32, mscorlib">
    <value>21</value>
@@ -3799,7 +3799,7 @@ Mandanten hinzu</value>
    <value>14, 24</value>
  </data>
  <data name="chklbxClient.Size" type="System.Drawing.Size, System.Drawing">
-    <value>192, 132</value>
+    <value>192, 116</value>
  </data>
  <data name="chklbxClient.TabIndex" type="System.Int32, mscorlib">
    <value>18</value>
@@ -3817,7 +3817,7 @@ Mandanten hinzu</value>
    <value>5</value>
  </data>
  <data name="XtraTabPage6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1006, 336</value>
+    <value>1002, 333</value>
  </data>
  <data name="XtraTabPage6.Text" xml:space="preserve">
    <value>Zuordnung Entität-Client</value>
@@ -3859,10 +3859,10 @@ Mandanten hinzu</value>
    <value>False</value>
  </data>
  <data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>292, 389</value>
+    <value>292, 386</value>
  </data>
  <data name="StatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1012, 22</value>
+    <value>1008, 22</value>
  </data>
  <data name="StatusStrip1.TabIndex" type="System.Int32, mscorlib">
    <value>35</value>
@@ -3906,7 +3906,7 @@ Mandanten hinzu</value>
    <value>292, 0</value>
  </data>
  <data name="ToolStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1012, 25</value>
+    <value>1008, 25</value>
  </data>
  <data name="ToolStrip1.TabIndex" type="System.Int32, mscorlib">
    <value>34</value>
@@ -3927,7 +3927,7 @@ Mandanten hinzu</value>
    <value>2</value>
  </data>
  <data name="XtraTabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1304, 411</value>
+    <value>1300, 408</value>
  </data>
  <data name="XtraTabPage1.Text" xml:space="preserve">
    <value>Entitäten-Übersicht</value>
--- a/app/DD-Record-Organiser/frmConstructor_Main.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.vb
@@ -4790,6 +4790,23 @@ Public Class frmConstructor_Main
    Private Sub grvwGrid_RowStyle(sender As Object, e As DevExpress.XtraGrid.Views.Grid.RowStyleEventArgs) Handles grvwGrid.RowStyle
        If e.RowHandle = DevExpress.XtraGrid.GridControl.AutoFilterRowHandle Then
            e.Appearance.BackColor = Color.Orange
+        Else
+            If GRID_TYPE = GridType.Grid Then
+                If e.RowHandle = -1 Then
+                    Exit Sub
+                End If
+                Try
+                    Dim row = grvwGrid.GetDataRow(e.RowHandle)
+                    Dim itemvalue = row.Item("COLOR")
+                    If itemvalue <> "" Then
+                        Console.WriteLine("RowColor: " & itemvalue)
+                        e.Appearance.BackColor = ColorTranslator.FromWin32(CInt(itemvalue))
+                    End If
+
+                Catch ex As Exception
+                    MsgBox(ex.Message, MsgBoxStyle.Critical)
+                End Try
+            End If
        End If
    End Sub
    Private Sub grvwGrid_MouseDown(sender As Object, e As MouseEventArgs) Handles grvwGrid.MouseDown, grvwTiles.MouseDown, grvwCarousel.MouseDown
--- a/app/DD-Record-Organiser/frmWD_Dokumentart_Konfig.Designer.vb
+++ b/app/DD-Record-Organiser/frmWD_Dokumentart_Konfig.Designer.vb
@@ -65,6 +65,7 @@ Partial Class frmWD_Dokumentart_Konfig
        Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
        Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.colBEZEICHNUNG = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colOBJEKTTYP = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.Button1 = New System.Windows.Forms.Button()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.ListBox3 = New System.Windows.Forms.ListBox()
@@ -152,7 +153,6 @@ Partial Class frmWD_Dokumentart_Konfig
        Me.TBPMO_WD_FORMVIEW_DOKTYPESTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_WD_FORMVIEW_DOKTYPESTableAdapter()
        Me.TBWH_DOKART_MODULETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBWH_DOKART_MODULETableAdapter()
        Me.ToolTipController1 = New DevExpress.Utils.ToolTipController(Me.components)
-        Me.colOBJEKTTYP = New DevExpress.XtraGrid.Columns.GridColumn()
        GUIDLabel = New System.Windows.Forms.Label()
        BEZEICHNUNGLabel = New System.Windows.Forms.Label()
        KURZNAMELabel = New System.Windows.Forms.Label()
@@ -467,6 +467,12 @@ Partial Class frmWD_Dokumentart_Konfig
        Me.colBEZEICHNUNG.FieldName = "BEZEICHNUNG"
        Me.colBEZEICHNUNG.Name = "colBEZEICHNUNG"
        '
+        'colOBJEKTTYP
+        '
+        resources.ApplyResources(Me.colOBJEKTTYP, "colOBJEKTTYP")
+        Me.colOBJEKTTYP.FieldName = "OBJEKTTYP"
+        Me.colOBJEKTTYP.Name = "colOBJEKTTYP"
+        '
        'Button1
        '
        resources.ApplyResources(Me.Button1, "Button1")
@@ -1089,12 +1095,6 @@ Partial Class frmWD_Dokumentart_Konfig
        '
        Me.TBWH_DOKART_MODULETableAdapter.ClearBeforeFill = True
        '
-        'colOBJEKTTYP
-        '
-        resources.ApplyResources(Me.colOBJEKTTYP, "colOBJEKTTYP")
-        Me.colOBJEKTTYP.FieldName = "OBJEKTTYP"
-        Me.colOBJEKTTYP.Name = "colOBJEKTTYP"
-        '
        'frmWD_Dokumentart_Konfig
        '
        resources.ApplyResources(Me, "$this")
--- a/app/DD-Record-Organiser/frmWD_Dokumentart_Konfig.resx
+++ b/app/DD-Record-Organiser/frmWD_Dokumentart_Konfig.resx
@@ -2599,6 +2599,12 @@
  <data name="&gt;&gt;colBEZEICHNUNG.Type" xml:space="preserve">
    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="&gt;&gt;colOBJEKTTYP.Name" xml:space="preserve">
+    <value>colOBJEKTTYP</value>
+  </data>
+  <data name="&gt;&gt;colOBJEKTTYP.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="&gt;&gt;TBWH_DOKART_MODULEBindingSource.Name" xml:space="preserve">
    <value>TBWH_DOKART_MODULEBindingSource</value>
  </data>
@@ -2875,12 +2881,6 @@
  <data name="&gt;&gt;ToolTipController1.Type" xml:space="preserve">
    <value>DevExpress.Utils.ToolTipController, DevExpress.Utils.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="&gt;&gt;colOBJEKTTYP.Name" xml:space="preserve">
-    <value>colOBJEKTTYP</value>
-  </data>
-  <data name="&gt;&gt;colOBJEKTTYP.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmWD_Dokumentart_Konfig</value>
  </data>
--- a/app/DD-Record-Organiser/frmWD_Dokumentart_Konfig.vb
+++ b/app/DD-Record-Organiser/frmWD_Dokumentart_Konfig.vb
@@ -144,20 +144,28 @@
    End Sub

    Private Sub btnZielpfad_Click(sender As Object, e As EventArgs) Handles btnZielpfad.Click
-        'First create a FolderBrowserDialog object
-        Dim FolderBrowserDialog1 As New FolderBrowserDialog
-        ' Then use the following code to create the Dialog window
-        ' Change the .SelectedPath property to the default location
-        With FolderBrowserDialog1
-            ' Desktop is the root folder in the dialog.
-            '.RootFolder = Environment.SpecialFolder.Desktop
-            ' Prompt the user with a custom message.
-            .Description = "Zielordner für Dokumentart wählen:"
-            If .ShowDialog = DialogResult.OK Then
-                Dim Path As String = .SelectedPath
-                ZIEL_PFADTextBox.Text = .SelectedPath
-            End If
-        End With
+        Try
+            'First create a FolderBrowserDialog object
+            Dim FolderBrowserDialog1 As New FolderBrowserDialog
+            ' Then use the following code to create the Dialog window
+            ' Change the .SelectedPath property to the default location
+            With FolderBrowserDialog1
+                ' Desktop is the root folder in the dialog.
+                If ZIEL_PFADTextBox.Text <> "" Then
+                    .SelectedPath = ZIEL_PFADTextBox.Text
+                End If
+                '.RootFolder = Environment.SpecialFolder.Desktop
+                ' Prompt the user with a custom message.
+                .Description = "Zielordner für Dokumentart wählen:"
+                If .ShowDialog = DialogResult.OK Then
+                    Dim Path As String = .SelectedPath
+                    ZIEL_PFADTextBox.Text = .SelectedPath
+                End If
+            End With
+        Catch ex As Exception
+            MsgBox("Unexpected Error in set Path:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
+       
    End Sub

    Private Sub ObjektTypenEintragen()