diff --git a/app/DD-Record-Organizer/Classes/ClassConfig.vb b/app/DD-Record-Organizer/Classes/ClassConfig.vb
index 7b4260e..7a4fecf 100644
--- a/app/DD-Record-Organizer/Classes/ClassConfig.vb
+++ b/app/DD-Record-Organizer/Classes/ClassConfig.vb
@@ -7,5 +7,5 @@ Public Class ClassConfig
Public Property ConnectionString As String = ""
' Misc Settings
Public Property DEBUG As Boolean = False
-
+ Public Property MyFormsDesign As String = "Office 2016 Colorful"
End Class
diff --git a/app/DD-Record-Organizer/frmConfig_Basic.vb b/app/DD-Record-Organizer/frmConfig_Basic.vb
index 0e80ae0..3630ee9 100644
--- a/app/DD-Record-Organizer/frmConfig_Basic.vb
+++ b/app/DD-Record-Organizer/frmConfig_Basic.vb
@@ -14,9 +14,9 @@ Public Class frmConfig_Basic
Try
Dim con As String
If chkbxUserAut.Checked Then
- con = "Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";Trusted_Connection=True;Application Name=DD ADDI-Client"
+ con = "Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";Trusted_Connection=True;Application Name=DD OrgFLOW-Client"
Else
- con = "Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";User Id=" & Me.txtUser.Text & ";Password=" & Me.txtPasswort.Text & ";Application Name=DD ADDI-Client"
+ con = "Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";User Id=" & Me.txtUser.Text & ";Password=" & Me.txtPasswort.Text & ";Application Name=DD OrgFLOW-Client"
End If
diff --git a/app/DD-Record-Organizer/frmLicense_User.resx b/app/DD-Record-Organizer/frmLicense_User.resx
index aac74f8..349f6bf 100644
--- a/app/DD-Record-Organizer/frmLicense_User.resx
+++ b/app/DD-Record-Organizer/frmLicense_User.resx
@@ -123,13 +123,17 @@
- Tahoma, 9.75pt, style=Bold
+ Tahoma, 9.75pt
- 12, 26
+ 14, 32
+
+
+
+ 4, 0, 4, 0
- 139, 16
+ 122, 16
0
@@ -150,10 +154,13 @@
10
- 175, 25
+ 204, 31
+
+
+ 4, 4, 4, 4
- 189, 21
+ 220, 24
1
@@ -174,19 +181,22 @@
True
- Tahoma, 9.75pt, style=Bold
+ Tahoma, 9.75pt
- 12, 68
+ 14, 84
+
+
+ 4, 0, 4, 0
- 116, 16
+ 129, 16
2
- ADDI - Lizenzen:
+ OrgFLOW - Lizenzen:
Label2
@@ -204,13 +214,16 @@
True
- Tahoma, 9.75pt, style=Bold
+ Tahoma, 9.75pt
- 12, 94
+ 14, 116
+
+
+ 4, 0, 4, 0
- 99, 16
+ 84, 16
3
@@ -234,13 +247,16 @@
True
- Tahoma, 9.75pt, style=Bold
+ Tahoma, 9.75pt
- 12, 122
+ 14, 150
+
+
+ 4, 0, 4, 0
- 73, 16
+ 64, 16
8
@@ -264,10 +280,13 @@
Tahoma, 9.75pt
- 264, 65
+ 308, 80
+
+
+ 4, 0, 4, 0
- 100, 23
+ 117, 28
10
@@ -294,10 +313,13 @@
Tahoma, 9.75pt
- 264, 91
+ 308, 112
+
+
+ 4, 0, 4, 0
- 100, 23
+ 117, 28
11
@@ -324,10 +346,13 @@
Tahoma, 9.75pt
- 264, 119
+ 308, 146
+
+
+ 4, 0, 4, 0
- 100, 23
+ 117, 28
13
@@ -351,10 +376,16 @@
3
- 15, 52
+ 18, 64
+
+
+ 4, 4, 4, 4
+
+
+ 4, 4, 4, 4
- 349, 1
+ 407, 1
14
@@ -372,10 +403,13 @@
2
- 15, 167
+ 18, 206
+
+
+ 4, 4, 4, 4
- 349, 136
+ 407, 167
22
@@ -396,17 +430,19 @@
True
- Tahoma, 9.75pt, style=Bold
+ Tahoma, 9.75pt
-
NoControl
- 12, 148
+ 14, 182
+
+
+ 4, 0, 4, 0
- 63, 16
+ 56, 16
23
@@ -430,13 +466,13 @@
True
- 6, 13
+ 7, 16
- 376, 315
+ 439, 388
- Tahoma, 8.25pt
+ Tahoma, 9.75pt
@@ -604,6 +640,9 @@
AAA=
+
+ 4, 4, 4, 4
+
CenterScreen
diff --git a/app/DD-Record-Organizer/frmMain.vb b/app/DD-Record-Organizer/frmMain.vb
index 534e2f7..1ddc510 100644
--- a/app/DD-Record-Organizer/frmMain.vb
+++ b/app/DD-Record-Organizer/frmMain.vb
@@ -508,9 +508,9 @@ Public Class frmMain
If DD_DMSDataSet.VWPMO_WF_ACTIVE.Rows.Count > 0 Then
NotifyIcon.Visible = True
If USER_LANGUAGE = "de-DE" Then
- NotifyIcon.ShowBalloonTip(50000, "ADDI-Unerledigte Tasks", "Sie haben unerledigte Tasks in Ihrem Verantwortungsbereich." & vbNewLine & "Bitte überprüfen Sie Ihre Workflow-Tasks", ToolTipIcon.Info)
+ NotifyIcon.ShowBalloonTip(50000, "OrgFLOW-Unerledigte Tasks", "Sie haben unerledigte Tasks in Ihrem Verantwortungsbereich." & vbNewLine & "Bitte überprüfen Sie Ihre Workflow-Tasks", ToolTipIcon.Info)
Else
- NotifyIcon.ShowBalloonTip(50000, "ADDI-Pending Tasks", "You have pending tasks in Your authority." & vbNewLine & "Please check Your Tasks", ToolTipIcon.Info)
+ NotifyIcon.ShowBalloonTip(50000, "OrgFLOW-Pending Tasks", "You have pending tasks in Your authority." & vbNewLine & "Please check Your Tasks", ToolTipIcon.Info)
End If
End If
diff --git a/app/DD-Record-Organizer/frmNodeNavigation.vb b/app/DD-Record-Organizer/frmNodeNavigation.vb
index d25f7db..fa57689 100644
--- a/app/DD-Record-Organizer/frmNodeNavigation.vb
+++ b/app/DD-Record-Organizer/frmNodeNavigation.vb
@@ -197,7 +197,7 @@ Public Class frmNodeNavigation
Try
Dim oToken = RunningTaskTokenSource.Token
- Dim Sql = String.Format("select T.GUID,T.RECORD_ID, T.NODE_CONFIG_ID,T.NODE_CAPTION,T.ID1, T.BACK_COLOR,T.PARENT_GUID from VWPMO_STRUCTURE_NODES T
+ Dim Sql = String.Format("select T.GUID,T.RECORD_ID, T.NODE_CONFIG_ID,T.NODE_CAPTION,T.ID1, T.BACK_COLOR,T.PARENT_GUID, T.SEQUENCE from VWPMO_STRUCTURE_NODES T
INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID WHERE T.ENTITY_ID = {0}", CURRENT_ENTITY_ID)
DT_STRUCTURE_NODES = MYDB_ECM.GetDatatable(Sql)
Sql = String.Format("select T.* from TBPMO_STRUCTURE_NODES_CONFIGURATION T INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID WHERE T.ENTITY_ID = {0}", CURRENT_ENTITY_ID)
@@ -239,7 +239,11 @@ Public Class frmNodeNavigation
Catch ex As Exception
End Try
+ Try
+ TreeListDevexpress.Columns.ColumnByName("SEQUENCE").Visible = False
+ Catch ex As Exception
+ End Try
Catch ex As Exception
LOGGER.Error(ex)