Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/ProcessManager

app/DD_PM_WINDREAM/App.config

@@ -12,7 +12,7 @@
   <applicationSettings>
     <DD_ProcessManager.My.MySettings>
       <setting name="UseAppConfigConString" serializeAs="String">
-        <value>True</value>
+        <value>False</value>
       </setting>
       <setting name="UserConfig_Prefix" serializeAs="String">
         <value>TEST</value>

app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb

@@ -120,6 +120,7 @@ Module ModuleRuntimeVariables
 
     Public Property CURRENT_DT_FINAL_INDEXING As DataTable
     Public Property CURRENT_DT_PROFILES As DataTable
+    Public Property CURRENT_DT_PROFILE_LANGUAGE As DataTable
     Public Property CURRENT_DT_PROFILE As DataTable
 
     Public Property CURRENT_CONTROL_NAME_LIST As New List(Of String)

app/DD_PM_WINDREAM/My Project/Settings.Designer.vb

@@ -291,7 +291,7 @@ Namespace My
         
         <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("True")>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
         Public ReadOnly Property UseAppConfigConString() As Boolean
             Get
                 Return CType(Me("UseAppConfigConString"),Boolean)

app/DD_PM_WINDREAM/My Project/Settings.settings

@@ -65,7 +65,7 @@
       <Value Profile="(Default)">Normal</Value>
     </Setting>
     <Setting Name="UseAppConfigConString" Type="System.Boolean" Scope="Application">
-      <Value Profile="(Default)">True</Value>
+      <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="UserConfig_Prefix" Type="System.String" Scope="Application">
       <Value Profile="(Default)">TEST</Value>

app/DD_PM_WINDREAM/frmAdministration.vb

@@ -920,9 +920,23 @@ Public Class frmAdministration
                 CHANGED_WHOTextBox.Text = USER_USERNAME
                 Me.TBPM_PROFILEBindingSource.EndEdit()
                 Me.TBPM_PROFILETableAdapter.Update(DD_DMSLiteDataSet.TBPM_PROFILE)
-                'Refresh_Profildaten()
+                Try
-                'Dim pos As Integer = TBPM_PROFILEBindingSource.Find("GUID", CURRENT_ProfilGUID)
+                    Dim oSQL = $"EXEC PRDD_GUI_LANGUAGE_PHRASE 'PM','PROFILE_TITLE{PROFILGUIDTextBox.Text}','{USER_LANGUAGE}',
-                'TBPM_PROFILEBindingSource.Position = pos
+                'Title of Profile','{TITLETextBox.Text}','','{USER_USERNAME}','{PROFILGUIDTextBox.Text}',0"
+                    DatabaseFallback.ExecuteNonQueryECM(oSQL)
+                    oSQL = $"EXEC PRDD_GUI_LANGUAGE_PHRASE 'PM','PROFILE_DESCRIPTION{PROFILGUIDTextBox.Text}','{USER_LANGUAGE}',
+                'Description of Profile','{DESCRIPTIONTextBox.Text}','','{USER_USERNAME}','{PROFILGUIDTextBox.Text}',0"
+                    DatabaseFallback.ExecuteNonQueryECM(oSQL)
+                    If FINAL_TEXTTextBox.Text <> String.Empty Then
+                        oSQL = $"EXEC PRDD_GUI_LANGUAGE_PHRASE 'PM','PROFILE_FINAL_TEXT{PROFILGUIDTextBox.Text}','{USER_LANGUAGE}',
+                'Description of Profile','{FINAL_TEXTTextBox.Text}','','{USER_USERNAME}','{PROFILGUIDTextBox.Text}',0"
+                        DatabaseFallback.ExecuteNonQueryECM(oSQL)
+                    End If
+
+                Catch ex As Exception
+
+                End Try
+
                 tsbStaticInfo.Caption = $"ProfileData saved - {Now.ToLongTimeString}"
                     UNSAVED_CHANGES_PROFILE = False
                 Else

app/DD_PM_WINDREAM/frmMain.vb

@@ -674,6 +674,7 @@ Public Class frmMain
                     Try
                         GridView_Docs.Columns("Zuletzt bearbeitet").DisplayFormat.FormatType = FormatType.DateTime
                         GridView_Docs.Columns("Zuletzt bearbeitet").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
+
                     Catch ex1 As Exception
                         LOGGER.Warn("(ResetLayout)Column [Last edited] or [Zuletzt bearbeitet] not part of OverviewSQL")
                     End Try
@@ -2263,10 +2264,12 @@ Public Class frmMain
         End If
     End Sub
     Sub LoadCURRENT_DT_PROFILES()
-        Dim oSQL = "select * from TBPM_PROFILE where ACTIVE = 1"
+        Dim oSQL = $"select * from TBPM_PROFILE where ACTIVE = 1"
-        'CURRENT_DT_PROFILES = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE", "")
         CURRENT_DT_PROFILES = DatabaseFallback.GetDatatable("TBPM_PROFILE", New GetDatatableOptions(oSQL, DatabaseType.ECM))
-
+        oSQL = $"select * from TBDD_GUI_LANGUAGE_PHRASE where LANGUAGE = '{USER_LANGUAGE}' AND MODULE = 'PM' AND TITLE LIKE 'PROFILE_%'"
+        CURRENT_DT_PROFILE_LANGUAGE = DatabaseFallback.GetDatatable("TBPMPROFILE_LANGUAGE_TERMS", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
+                .FilterExpression = $"LANGUAGE = '{USER_LANGUAGE}'"
+            })
     End Sub
     Sub LoadVWPM_CONTROL_INDEX()
         Dim oSQL = $"SELECT * FROM VWPM_CONTROL_INDEX ORDER BY PROFIL_ID,Y_LOC, X_LOC"
@@ -2363,10 +2366,12 @@ Public Class frmMain
         Await Decide_Load(True)
         Handling_DEBUG_USER()
 
-        Dim oSQL = $"SELECT * FROM TBDD_NOTIFICATIONS_SYSTEM 
+        Dim oSQL = $"SELECT * FROM TBDD_NOTIFICATIONS_SYSTEM NOTE
-            where DISPLAY_UNTIL <= CONVERT(DATE,GETDATE()) or DISPLAY_UNTIL IS NULL AND MODULE = 'PM' 
+INNER JOIN (SELECT * FROM TBDD_NOTIFICATIONS_SYSTEM WHERE LANG_CODE = '{USER_LANGUAGE}' OR LANG_CODE = 'ALL') LANG ON NOTE.GUID = LANG.GUID
-            AND GUID NOT IN (SELECT NOTIFY_ID FROM TBDD_NOTIFICATIONS_USER_HISTORY WHERE USR_ID = {USER_ID})"
+where (CONVERT(DATE,GETDATE()) <= NOTE.DISPLAY_UNTIL or NOTE.DISPLAY_UNTIL IS NULL) AND NOTE.MODULE = 'PM' 
+            AND NOTE.GUID NOT IN (SELECT NOTIFY_ID FROM TBDD_NOTIFICATIONS_USER_HISTORY WHERE USR_ID = {USER_ID})"
         Dim oDT As DataTable = DatabaseFallback.GetDatatable("TBDD_NOTIFICATIONS_SYSTEM", New GetDatatableOptions(oSQL, DatabaseType.ECM))
+
         If Not IsNothing(oDT) Then
             If oDT.Rows.Count > 0 Then
                 Dim oEnvironment = GetEnvironment()

app/DD_PM_WINDREAM/frmValidator.vb

@@ -250,10 +250,29 @@ Public Class frmValidator
                         PROFIL_VEKTORINDEX = oProfileRow.Item("PM_VEKTOR_INDEX")
                         PROFIL_LOGINDEX = oProfileRow.Item("LOG_INDEX")
                         CURRENT_PROFILE_LOG_INDEX = PROFIL_LOGINDEX
-                        Me.Text = ADDITIONAL_TITLE & " - " & oProfileRow.Item("TITLE")
 
-                        TITLELabel1.Text = oProfileRow.Item("TITLE")
+                        Dim oProfileTitle As String = ""
-                        DESCRIPTIONLabel.Text = IIf(IsDBNull(oProfileRow.Item("DESCRIPTION")), "", oProfileRow.Item("DESCRIPTION"))
+                        Dim oProfileDescription As String = ""
+                        Dim oProfileFinalText As String = ""
+                        For Each oRow As DataRow In CURRENT_DT_PROFILE_LANGUAGE.Rows
+                            Console.WriteLine(oRow.Item("TITLE"))
+                            If oRow.Item("TITLE") = $"PROFILE_TITLE{CURRENT_ProfilGUID}" Then
+                                oProfileTitle = oRow.Item("STRING1")
+                            ElseIf oRow.Item("TITLE") = $"PROFILE_DESCRIPTION{CURRENT_ProfilGUID}" Then
+                                oProfileDescription = oRow.Item("STRING1")
+                            ElseIf oRow.Item("TITLE") = $"PROFILE_FINAL_TEXT{CURRENT_ProfilGUID}" Then
+                                oProfileFinalText = oRow.Item("STRING1")
+                            End If
+                        Next
+                        If oProfileTitle = "" Then
+                            oProfileTitle = oProfileRow.Item("TITLE")
+                        End If
+                        Me.Text = ADDITIONAL_TITLE & " - " & oProfileTitle
+                        If oProfileDescription = "" Then
+                            IIf(IsDBNull(oProfileRow.Item("DESCRIPTION")), "", oProfileRow.Item("DESCRIPTION"))
+                        End If
+                        TITLELabel1.Text = oProfileTitle
+                        DESCRIPTIONLabel.Text = oProfileDescription
                         If PROFIL_VEKTORINDEX.GetType.ToString.ToLower = "system.dbnull" Then
                             PROFIL_VEKTORINDEX = ""
                         End If
@@ -266,21 +285,17 @@ Public Class frmValidator
                         Move2Folder = IIf(IsDBNull(oProfileRow.Item("MOVE2Folder")), "", oProfileRow.Item("MOVE2Folder"))
                         Try
                             If finalProfile = True Then
-                                Dim text As String = IIf(IsDBNull(oProfileRow.Item("FINAL_TEXT")), "", oProfileRow.Item("FINAL_TEXT") & (" (F2)"))
+                                If oProfileFinalText = "" Then
-                                If text <> "" Then
+                                    oProfileFinalText = IIf(IsDBNull(oProfileRow.Item("FINAL_TEXT")), "", oProfileRow.Item("FINAL_TEXT") & (" (F2)"))
-                                    btnSave.Text = text
                                 Else
-                                    'Try
+                                    oProfileFinalText = $"{oProfileFinalText} (F2)"
-                                    '    btnSave.Text = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("frmValidator.ValidationButton")
-                                    'Catch ex As Exception
-                                    '    LOGGER.Warn("Missing Config frmValidator.ValidationButton in TBDD_GUI_LANGUAGE_PHRASE")
-                                    'End Try
-                                    btnSave.Text = S.Speichern___Nächster_Vorgang__F2_
-
                                 End If
+
+                                btnSave.Text = oProfileFinalText
                             Else
+                                oProfileFinalText = IIf(IsDBNull(oProfileRow.Item("FINAL_TEXT")), "", oProfileRow.Item("FINAL_TEXT") & (" (F2)"))
                                 'btnSave.Text = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("frmValidator.ValidationButton")
-                                btnSave.Text = S.Speichern___Nächster_Vorgang__F2_
+                                btnSave.Text = oProfileFinalText
                             End If
                             LOGGER.Debug("Buttontext validation loaded")
                         Catch ex As Exception