diff --git a/app/DD-Record-Organiser/frmConfig_Basic.vb b/app/DD-Record-Organiser/frmConfig_Basic.vb
index e3b38bf..56a67ac 100644
--- 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
diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb
index 1198d72..b64b5d5 100644
--- 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
diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.resx b/app/DD-Record-Organiser/frmConstructorDesigner.resx
index 2ccd413..8c64b77 100644
--- 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 @@
1
- 292, 411
+ 292, 408
1
@@ -1913,7 +1913,7 @@
21
- 1010, 339
+ 1002, 333
Allgemein
@@ -1931,7 +1931,7 @@
1
- 1012, 364
+ 1008, 361
35
@@ -2382,7 +2382,7 @@
13
- 1010, 339
+ 1006, 336
Quick View Konfiguration
@@ -2853,7 +2853,7 @@
5, 24
- 825, 157
+ 821, 157
78
@@ -3027,7 +3027,7 @@
5, 187
- 825, 148
+ 821, 148
44
@@ -3048,7 +3048,7 @@
2
- 1010, 339
+ 1002, 333
windream-Suche Konfiguration
@@ -3102,7 +3102,7 @@
102
- 272, 280
+ 272, 274
89
@@ -3132,7 +3132,7 @@
NoControl
- 283, 149
+ 283, 143
132, 15
@@ -3168,7 +3168,7 @@
NoControl
- 536, 149
+ 536, 143
55, 15
@@ -3195,7 +3195,7 @@
Bottom, Left
- 539, 167
+ 539, 161
449, 140
@@ -3234,7 +3234,7 @@
False
- 287, 167
+ 287, 161
246, 140
@@ -3267,7 +3267,7 @@
NoControl
- 733, 133
+ 733, 127
255, 31
@@ -3552,7 +3552,7 @@
3, 3, 3, 3
- 1002, 313
+ 994, 307
0
@@ -3579,7 +3579,7 @@
3, 3, 3, 3
- 1002, 313
+ 994, 307
1
@@ -3606,7 +3606,7 @@
0, 0
- 1010, 339
+ 1002, 333
0
@@ -3624,7 +3624,7 @@
0
- 1010, 339
+ 1002, 333
Einschränkungen User
@@ -3711,7 +3711,7 @@
399, 24
- 192, 132
+ 192, 116
21
@@ -3799,7 +3799,7 @@ Mandanten hinzu
14, 24
- 192, 132
+ 192, 116
18
@@ -3817,7 +3817,7 @@ Mandanten hinzu
5
- 1006, 336
+ 1002, 333
Zuordnung Entität-Client
@@ -3859,10 +3859,10 @@ Mandanten hinzu
False
- 292, 389
+ 292, 386
- 1012, 22
+ 1008, 22
35
@@ -3906,7 +3906,7 @@ Mandanten hinzu
292, 0
- 1012, 25
+ 1008, 25
34
@@ -3927,7 +3927,7 @@ Mandanten hinzu
2
- 1304, 411
+ 1300, 408
Entitäten-Übersicht
diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb
index 864ff9f..d403f30 100644
--- 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
diff --git a/app/DD-Record-Organiser/frmWD_Dokumentart_Konfig.Designer.vb b/app/DD-Record-Organiser/frmWD_Dokumentart_Konfig.Designer.vb
index 3daf108..bee108e 100644
--- 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")
diff --git a/app/DD-Record-Organiser/frmWD_Dokumentart_Konfig.resx b/app/DD-Record-Organiser/frmWD_Dokumentart_Konfig.resx
index ab1ddf2..f2fe4e6 100644
--- a/app/DD-Record-Organiser/frmWD_Dokumentart_Konfig.resx
+++ b/app/DD-Record-Organiser/frmWD_Dokumentart_Konfig.resx
@@ -2599,6 +2599,12 @@
DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+ colOBJEKTTYP
+
+
+ DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
TBWH_DOKART_MODULEBindingSource
@@ -2875,12 +2881,6 @@
DevExpress.Utils.ToolTipController, DevExpress.Utils.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-
- colOBJEKTTYP
-
-
- DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-
frmWD_Dokumentart_Konfig
diff --git a/app/DD-Record-Organiser/frmWD_Dokumentart_Konfig.vb b/app/DD-Record-Organiser/frmWD_Dokumentart_Konfig.vb
index bc46b9a..07ef77f 100644
--- 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()