MS Diverses Frontend

2023-09-14 15:45:25 +02:00
parent 77547b5e61
commit 1564b79ed9
5 changed files with 81 additions and 38 deletions
--- 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
--- 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


--- a/app/DD-Record-Organizer/frmLicense_User.resx
+++ b/app/DD-Record-Organizer/frmLicense_User.resx
@@ -123,13 +123,17 @@
  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="Label1.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 9.75pt, style=Bold</value>
+    <value>Tahoma, 9.75pt</value>
  </data>
  <data name="Label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 26</value>
+    <value>14, 32</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Label1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
  </data>
  <data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>139, 16</value>
+    <value>122, 16</value>
  </data>
  <data name="Label1.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -150,10 +154,13 @@
    <value>10</value>
  </data>
  <data name="cmbClients.Location" type="System.Drawing.Point, System.Drawing">
-    <value>175, 25</value>
+    <value>204, 31</value>
+  </data>
+  <data name="cmbClients.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
  </data>
  <data name="cmbClients.Size" type="System.Drawing.Size, System.Drawing">
-    <value>189, 21</value>
+    <value>220, 24</value>
  </data>
  <data name="cmbClients.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -174,19 +181,22 @@
    <value>True</value>
  </data>
  <data name="Label2.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 9.75pt, style=Bold</value>
+    <value>Tahoma, 9.75pt</value>
  </data>
  <data name="Label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 68</value>
+    <value>14, 84</value>
+  </data>
+  <data name="Label2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
  </data>
  <data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>116, 16</value>
+    <value>129, 16</value>
  </data>
  <data name="Label2.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
  </data>
  <data name="Label2.Text" xml:space="preserve">
-    <value>ADDI - Lizenzen:</value>
+    <value>OrgFLOW - Lizenzen:</value>
  </data>
  <data name="&gt;&gt;Label2.Name" xml:space="preserve">
    <value>Label2</value>
@@ -204,13 +214,16 @@
    <value>True</value>
  </data>
  <data name="Label3.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 9.75pt, style=Bold</value>
+    <value>Tahoma, 9.75pt</value>
  </data>
  <data name="Label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 94</value>
+    <value>14, 116</value>
+  </data>
+  <data name="Label3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
  </data>
  <data name="Label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>99, 16</value>
+    <value>84, 16</value>
  </data>
  <data name="Label3.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
@@ -234,13 +247,16 @@
    <value>True</value>
  </data>
  <data name="Label5.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 9.75pt, style=Bold</value>
+    <value>Tahoma, 9.75pt</value>
  </data>
  <data name="Label5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 122</value>
+    <value>14, 150</value>
+  </data>
+  <data name="Label5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
  </data>
  <data name="Label5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>73, 16</value>
+    <value>64, 16</value>
  </data>
  <data name="Label5.TabIndex" type="System.Int32, mscorlib">
    <value>8</value>
@@ -264,10 +280,13 @@
    <value>Tahoma, 9.75pt</value>
  </data>
  <data name="lbLicenceCount.Location" type="System.Drawing.Point, System.Drawing">
-    <value>264, 65</value>
+    <value>308, 80</value>
+  </data>
+  <data name="lbLicenceCount.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
  </data>
  <data name="lbLicenceCount.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 23</value>
+    <value>117, 28</value>
  </data>
  <data name="lbLicenceCount.TabIndex" type="System.Int32, mscorlib">
    <value>10</value>
@@ -294,10 +313,13 @@
    <value>Tahoma, 9.75pt</value>
  </data>
  <data name="lbDossierCount.Location" type="System.Drawing.Point, System.Drawing">
-    <value>264, 91</value>
+    <value>308, 112</value>
+  </data>
+  <data name="lbDossierCount.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
  </data>
  <data name="lbDossierCount.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 23</value>
+    <value>117, 28</value>
  </data>
  <data name="lbDossierCount.TabIndex" type="System.Int32, mscorlib">
    <value>11</value>
@@ -324,10 +346,13 @@
    <value>Tahoma, 9.75pt</value>
  </data>
  <data name="lbValidUntil.Location" type="System.Drawing.Point, System.Drawing">
-    <value>264, 119</value>
+    <value>308, 146</value>
+  </data>
+  <data name="lbValidUntil.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
  </data>
  <data name="lbValidUntil.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 23</value>
+    <value>117, 28</value>
  </data>
  <data name="lbValidUntil.TabIndex" type="System.Int32, mscorlib">
    <value>13</value>
@@ -351,10 +376,16 @@
    <value>3</value>
  </data>
  <data name="GroupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 52</value>
+    <value>18, 64</value>
+  </data>
+  <data name="GroupBox1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
+  <data name="GroupBox1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
  </data>
  <data name="GroupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 1</value>
+    <value>407, 1</value>
  </data>
  <data name="GroupBox1.TabIndex" type="System.Int32, mscorlib">
    <value>14</value>
@@ -372,10 +403,13 @@
    <value>2</value>
  </data>
  <data name="DataGridViewAddOns.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 167</value>
+    <value>18, 206</value>
+  </data>
+  <data name="DataGridViewAddOns.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
  </data>
  <data name="DataGridViewAddOns.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 136</value>
+    <value>407, 167</value>
  </data>
  <data name="DataGridViewAddOns.TabIndex" type="System.Int32, mscorlib">
    <value>22</value>
@@ -396,17 +430,19 @@
    <value>True</value>
  </data>
  <data name="Label4.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 9.75pt, style=Bold</value>
+    <value>Tahoma, 9.75pt</value>
  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="Label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>NoControl</value>
  </data>
  <data name="Label4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 148</value>
+    <value>14, 182</value>
+  </data>
+  <data name="Label4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
  </data>
  <data name="Label4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>63, 16</value>
+    <value>56, 16</value>
  </data>
  <data name="Label4.TabIndex" type="System.Int32, mscorlib">
    <value>23</value>
@@ -430,13 +466,13 @@
    <value>True</value>
  </metadata>
  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
+    <value>7, 16</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>376, 315</value>
+    <value>439, 388</value>
  </data>
  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 8.25pt</value>
+    <value>Tahoma, 9.75pt</value>
  </data>
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
@@ -604,6 +640,9 @@
        AAA=
 </value>
  </data>
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
    <value>CenterScreen</value>
  </data>
--- 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
--- 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)