MS

2020-06-10 15:41:00 +02:00 · 2020-06-10 15:41:00 +02:00 · 671eccc2e9
commit 671eccc2e9
parent f2a3042f50
6 changed files with 1592 additions and 528 deletions
--- a/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb
+++ b/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb
@ -9,7 +9,7 @@ Public Class ClassAllgemeineFunktionen
        Dim oExpression = $"LANGUAGE ='{USER_LANGUAGE}' AND TITLE = '{pTITLE}'"
        BASEDATA_DT_GUI_LANGUAGE_PHRASES.Select(oExpression).CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges)
        If oFilteredDatatable.Rows.Count = 1 Then
-            If oFilteredDatatable.Rows(0).Item("CAPT_TYPE") = "MsgBox" Then
+            If oFilteredDatatable.Rows(0).Item("CAPT_TYPE") = "MsgBox" Or oFilteredDatatable.Rows(0).Item("CAPT_TYPE") = "MsgboxResult" Then
                Return oFilteredDatatable
            Else
                If oFilteredDatatable.Rows(0).Item("STRING2") <> String.Empty Then
@ -195,7 +195,7 @@ Public Class ClassAllgemeineFunktionen
            Dim version As Integer = 1
            If vZiel_Pfad <> path Then
                Dim Stammname As String = IO.Path.GetFileNameWithoutExtension(vMove_File)
-                Do While file_exists(_Ziel, clsWD) = True
+                Do While Check_File_exists(_Ziel, clsWD) = True
                    Dim neuername As String = Stammname & "~" & version & extension
                    _Ziel = neuername
                    version = version + 1
@ -216,7 +216,7 @@ Public Class ClassAllgemeineFunktionen
            Return ex.Message
        End Try
    End Function
-    Public Function file_exists(ByVal _file As String, clsWD As ClassWindream_allgemein)
+    Public Function Check_File_exists(ByVal _file As String, clsWD As ClassWindream_allgemein)
        Try
            Return clsWD.CheckFileExists(_file)
        Catch ex As Exception
@ -225,7 +225,7 @@ Public Class ClassAllgemeineFunktionen
            Return False
        End Try
    End Function
-    Public Function checkValue_Exists(sqlbefehl As String, Replace_value As String, Check_value As String, Typ As String, connString As String, profilid As Integer)
+    Public Function CheckValue_Exists(sqlbefehl As String, Replace_value As String, Check_value As String, Typ As String, connString As String, profilid As Integer)
        Try
            Dim sql As String
            Dim CONNTYPE As String
@ -250,9 +250,9 @@ Public Class ClassAllgemeineFunktionen
                sql = sqlscalar
                Dim ergebnis As Integer
                If CONNTYPE = "ORACLE" Then
-                    ergebnis = Execute_Scalar_Oracle(sql, connString, True, profilid)
+                    ergebnis = Execute_Scalar_Oracle(sql, connString, True)
                Else
-                    ergebnis = Execute_Scalar_SQLServer(sql, connString, True, profilid)
+                    ergebnis = Execute_Scalar_SQLServer(sql, connString, True)
                End If

                Select Case ergebnis
@ -270,7 +270,7 @@ Public Class ClassAllgemeineFunktionen
        End Try
    End Function

-    Function Execute_Scalar_SQLServer(vsql_statement As String, vconnectionString As String, check As Boolean, profil_id As Integer)
+    Function Execute_Scalar_SQLServer(vsql_statement As String, vconnectionString As String, check As Boolean)
        Try
            Dim cnn As SqlConnection
            cnn = New SqlConnection(vconnectionString)
@ -305,7 +305,7 @@ Public Class ClassAllgemeineFunktionen
            Return 99
        End Try
    End Function
-    Function Execute_Scalar_Oracle(vsql_statement As String, vconnectionString As String, check As Boolean, profil_id As Integer)
+    Function Execute_Scalar_Oracle(vsql_statement As String, vconnectionString As String, check As Boolean)
        Try
            Dim cnn As System.Data.OleDb.OleDbConnection
            cnn = New System.Data.OleDb.OleDbConnection(vconnectionString)
--- a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb
@ -237,9 +237,13 @@ Partial Class frmAdministration
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.BarButtonItem23 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem24 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem25 = New DevExpress.XtraBars.BarButtonItem()
        GUIDLabel = New System.Windows.Forms.Label()
        NAMELabel = New System.Windows.Forms.Label()
        DESCRIPTIONLabel = New System.Windows.Forms.Label()
@ -1570,11 +1574,11 @@ Partial Class frmAdministration
        'RibbonControl1
        '
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem11, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.tsbStaticInfo, Me.BarButtonItem20, Me.BarButtonItem21, Me.bbtnItemFinishSQL, Me.BarButtonItem22})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem11, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.tsbStaticInfo, Me.BarButtonItem20, Me.BarButtonItem21, Me.bbtnItemFinishSQL, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25})
        resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
-        Me.RibbonControl1.MaxItemId = 25
+        Me.RibbonControl1.MaxItemId = 28
        Me.RibbonControl1.Name = "RibbonControl1"
-        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
+        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3})
        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
        '
@ -1765,7 +1769,7 @@ Partial Class frmAdministration
        '
        'RibbonPage1
        '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup4, Me.RibbonPageGroup3})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup4})
        Me.RibbonPage1.Name = "RibbonPage1"
        resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
        '
@ -1800,16 +1804,6 @@ Partial Class frmAdministration
        Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
        resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4")
        '
-        'RibbonPageGroup3
-        '
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem20)
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem9)
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem11)
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem10)
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem14)
-        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
-        resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3")
-        '
        'RibbonStatusBar1
        '
        Me.RibbonStatusBar1.ItemLinks.Add(Me.tsbStaticInfo)
@ -1822,6 +1816,40 @@ Partial Class frmAdministration
        Me.RibbonPage2.Name = "RibbonPage2"
        resources.ApplyResources(Me.RibbonPage2, "RibbonPage2")
        '
+        'RibbonPage3
+        '
+        Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup5})
+        Me.RibbonPage3.Name = "RibbonPage3"
+        resources.ApplyResources(Me.RibbonPage3, "RibbonPage3")
+        '
+        'RibbonPageGroup5
+        '
+        Me.RibbonPageGroup5.ItemLinks.Add(Me.BarButtonItem20)
+        Me.RibbonPageGroup5.ItemLinks.Add(Me.BarButtonItem14)
+        Me.RibbonPageGroup5.ItemLinks.Add(Me.BarButtonItem11)
+        Me.RibbonPageGroup5.ItemLinks.Add(Me.BarButtonItem9)
+        Me.RibbonPageGroup5.ItemLinks.Add(Me.BarButtonItem10)
+        Me.RibbonPageGroup5.Name = "RibbonPageGroup5"
+        resources.ApplyResources(Me.RibbonPageGroup5, "RibbonPageGroup5")
+        '
+        'BarButtonItem23
+        '
+        resources.ApplyResources(Me.BarButtonItem23, "BarButtonItem23")
+        Me.BarButtonItem23.Id = 25
+        Me.BarButtonItem23.Name = "BarButtonItem23"
+        '
+        'BarButtonItem24
+        '
+        resources.ApplyResources(Me.BarButtonItem24, "BarButtonItem24")
+        Me.BarButtonItem24.Id = 26
+        Me.BarButtonItem24.Name = "BarButtonItem24"
+        '
+        'BarButtonItem25
+        '
+        resources.ApplyResources(Me.BarButtonItem25, "BarButtonItem25")
+        Me.BarButtonItem25.Id = 27
+        Me.BarButtonItem25.Name = "BarButtonItem25"
+        '
        'frmAdministration
        '
        Me.Appearance.Options.UseFont = True
@ -2041,7 +2069,6 @@ Partial Class frmAdministration
    Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem
@ -2117,4 +2144,9 @@ Partial Class frmAdministration
    Friend WithEvents Button4 As Button
    Friend WithEvents Button3 As Button
    Friend WithEvents Button2 As Button
+    Friend WithEvents BarButtonItem23 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItem24 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItem25 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage
+    Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
 End Class
--- a/app/DD_PM_WINDREAM/frmAdministration.resx
+++ b/app/DD_PM_WINDREAM/frmAdministration.resx
--- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb
@ -94,7 +94,7 @@ Partial Class frmValidator
        Me.RepositoryItemComboBox2 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox()
        Me.BarEditItem3 = New DevExpress.XtraBars.BarEditItem()
        Me.RepositoryItemComboBox3 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox()
-        Me.RibbonPageCategory1 = New DevExpress.XtraBars.Ribbon.RibbonPageCategory()
+        Me.RibbonPageConversations = New DevExpress.XtraBars.Ribbon.RibbonPageCategory()
        Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroupConv1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupConv_Change = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@ -104,6 +104,7 @@ Partial Class frmValidator
        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem()
        CType(Me.SplitContainer2_DV_Chat, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainer2_DV_Chat.SuspendLayout()
        CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
@ -130,8 +131,8 @@ Partial Class frmValidator
        Me.SplitContainer2_DV_Chat.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.None
        Me.SplitContainer2_DV_Chat.Name = "SplitContainer2_DV_Chat"
        Me.SplitContainer2_DV_Chat.Panel1.Controls.Add(Me.SplitContainer1)
-        resources.ApplyResources(Me.SplitContainer2_DV_Chat.Panel1, "SplitContainer2_DV_Chat.SplitContainer2_DV_Chat_Panel1")
-        resources.ApplyResources(Me.SplitContainer2_DV_Chat.Panel2, "SplitContainer2_DV_Chat.SplitContainer2_DV_Chat_Panel2")
+        resources.ApplyResources(Me.SplitContainer2_DV_Chat.Panel1, "SplitContainer2_DV_Chat.Panel1")
+        resources.ApplyResources(Me.SplitContainer2_DV_Chat.Panel2, "SplitContainer2_DV_Chat.Panel2")
        Me.SplitContainer2_DV_Chat.Panel2.Controls.Add(Me.ChatControl1)
        Me.SplitContainer2_DV_Chat.SplitterPosition = 919
        '
@ -445,11 +446,11 @@ Partial Class frmValidator
        'RibbonControl1
        '
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnItm, Me.BarButtonItem2, Me.BarLinkContainerItem1, Me.bbtnitem_ConversationEnd, Me.bbtnitem_ConversationNew, Me.BarLinkContainerItem2, Me.BarEditItem1, Me.BarEditItem2, Me.BarEditItem3})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnItm, Me.BarButtonItem2, Me.BarLinkContainerItem1, Me.bbtnitem_ConversationEnd, Me.bbtnitem_ConversationNew, Me.BarLinkContainerItem2, Me.BarEditItem1, Me.BarEditItem2, Me.BarEditItem3, Me.BarButtonItem5})
        resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
-        Me.RibbonControl1.MaxItemId = 25
+        Me.RibbonControl1.MaxItemId = 26
        Me.RibbonControl1.Name = "RibbonControl1"
-        Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategory1})
+        Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageConversations})
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
        Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemComboBox1, Me.RepositoryItemComboBox2, Me.RepositoryItemComboBox3})
        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@ -638,10 +639,11 @@ Partial Class frmValidator
        '
        'BarEditItem3
        '
-        resources.ApplyResources(Me.BarEditItem3, "BarEditItem3")
        Me.BarEditItem3.Edit = Me.RepositoryItemComboBox3
+        resources.ApplyResources(Me.BarEditItem3, "BarEditItem3")
        Me.BarEditItem3.Id = 24
        Me.BarEditItem3.Name = "BarEditItem3"
+        Me.BarEditItem3.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
        '
        'RepositoryItemComboBox3
        '
@ -649,11 +651,11 @@ Partial Class frmValidator
        Me.RepositoryItemComboBox3.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemComboBox3.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))})
        Me.RepositoryItemComboBox3.Name = "RepositoryItemComboBox3"
        '
-        'RibbonPageCategory1
+        'RibbonPageConversations
        '
-        Me.RibbonPageCategory1.Name = "RibbonPageCategory1"
-        Me.RibbonPageCategory1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage3})
-        resources.ApplyResources(Me.RibbonPageCategory1, "RibbonPageCategory1")
+        Me.RibbonPageConversations.Name = "RibbonPageConversations"
+        Me.RibbonPageConversations.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage3})
+        resources.ApplyResources(Me.RibbonPageConversations, "RibbonPageConversations")
        '
        'RibbonPage3
        '
@ -671,6 +673,7 @@ Partial Class frmValidator
        'RibbonPageGroupConv_Change
        '
        Me.RibbonPageGroupConv_Change.ItemLinks.Add(Me.BarEditItem3)
+        Me.RibbonPageGroupConv_Change.ItemLinks.Add(Me.BarButtonItem5)
        Me.RibbonPageGroupConv_Change.Name = "RibbonPageGroupConv_Change"
        resources.ApplyResources(Me.RibbonPageGroupConv_Change, "RibbonPageGroupConv_Change")
        '
@ -724,6 +727,12 @@ Partial Class frmValidator
        Me.RibbonPage2.Name = "RibbonPage2"
        resources.ApplyResources(Me.RibbonPage2, "RibbonPage2")
        '
+        'BarButtonItem5
+        '
+        resources.ApplyResources(Me.BarButtonItem5, "BarButtonItem5")
+        Me.BarButtonItem5.Id = 25
+        Me.BarButtonItem5.Name = "BarButtonItem5"
+        '
        'frmValidator
        '
        Me.Appearance.Options.UseFont = True
@ -831,7 +840,7 @@ Partial Class frmValidator
    Friend WithEvents BarLinkContainerItem1 As DevExpress.XtraBars.BarLinkContainerItem
    Friend WithEvents bbtnitem_ConversationEnd As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents bbtnitem_ConversationNew As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents RibbonPageCategory1 As DevExpress.XtraBars.Ribbon.RibbonPageCategory
+    Friend WithEvents RibbonPageConversations As DevExpress.XtraBars.Ribbon.RibbonPageCategory
    Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage
    Friend WithEvents RibbonPageGroupConv1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents BarLinkContainerItem2 As DevExpress.XtraBars.BarLinkContainerItem
@ -843,4 +852,5 @@ Partial Class frmValidator
    Friend WithEvents BarEditItem3 As DevExpress.XtraBars.BarEditItem
    Friend WithEvents RepositoryItemComboBox3 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox
    Friend WithEvents ChatControl1 As DigitalData.Controls.ChatControl.ChatControl
+    Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem
 End Class
--- a/app/DD_PM_WINDREAM/frmValidator.resx
+++ b/app/DD_PM_WINDREAM/frmValidator.resx
@ -355,15 +355,15 @@
    <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;SplitContainer1.Parent" xml:space="preserve">
-    <value>SplitContainer2_DV_Chat.SplitContainer2_DV_Chat_Panel1</value>
+    <value>SplitContainer2_DV_Chat.Panel1</value>
  </data>
  <data name="&gt;&gt;SplitContainer1.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
-  <data name="SplitContainer2_DV_Chat.SplitContainer2_DV_Chat_Panel1.Text" xml:space="preserve">
+  <data name="SplitContainer2_DV_Chat.Panel1.Text" xml:space="preserve">
    <value>Panel1</value>
  </data>
-  <data name="SplitContainer2_DV_Chat.SplitContainer2_DV_Chat_Panel2.AutoScroll" type="System.Boolean, mscorlib">
+  <data name="SplitContainer2_DV_Chat.Panel2.AutoScroll" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
  <data name="ChatControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
@ -391,12 +391,12 @@
    <value>DigitalData.Controls.ChatControl.ChatControl, DigitalData.Controls.ChatControl, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;ChatControl1.Parent" xml:space="preserve">
-    <value>SplitContainer2_DV_Chat.SplitContainer2_DV_Chat_Panel2</value>
+    <value>SplitContainer2_DV_Chat.Panel2</value>
  </data>
  <data name="&gt;&gt;ChatControl1.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
-  <data name="SplitContainer2_DV_Chat.SplitContainer2_DV_Chat_Panel2.Text" xml:space="preserve">
+  <data name="SplitContainer2_DV_Chat.Panel2.Text" xml:space="preserve">
    <value>Panel2</value>
  </data>
  <data name="SplitContainer2_DV_Chat.Size" type="System.Drawing.Size, System.Drawing">
@ -966,15 +966,18 @@
  <data name="RepositoryItemComboBox2.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v19.2">
    <value>Combo</value>
  </data>
-  <data name="BarEditItem3.Caption" xml:space="preserve">
-    <value>BarEditItem3</value>
-  </data>
  <data name="RepositoryItemComboBox3.AutoHeight" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
  <data name="RepositoryItemComboBox3.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v19.2">
    <value>Combo</value>
  </data>
+  <data name="BarEditItem3.EditWidth" type="System.Int32, mscorlib">
+    <value>200</value>
+  </data>
+  <data name="BarButtonItem5.Caption" xml:space="preserve">
+    <value>BarButtonItem5</value>
+  </data>
  <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
@ -982,12 +985,12 @@
    <value>Aktionen</value>
  </data>
  <data name="RibbonPageGroupConv_Change.Text" xml:space="preserve">
-    <value>Wechsel</value>
+    <value>Beendete Konversationen</value>
  </data>
  <data name="RibbonPage3.Text" xml:space="preserve">
    <value>Start</value>
  </data>
-  <data name="RibbonPageCategory1.Text" xml:space="preserve">
+  <data name="RibbonPageConversations.Text" xml:space="preserve">
    <value>Konversationen</value>
  </data>
  <data name="RibbonPageFile.Text" xml:space="preserve">
@ -1606,10 +1609,10 @@
  <data name="&gt;&gt;RepositoryItemComboBox3.Type" xml:space="preserve">
    <value>DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="&gt;&gt;RibbonPageCategory1.Name" xml:space="preserve">
-    <value>RibbonPageCategory1</value>
+  <data name="&gt;&gt;RibbonPageConversations.Name" xml:space="preserve">
+    <value>RibbonPageConversations</value>
  </data>
-  <data name="&gt;&gt;RibbonPageCategory1.Type" xml:space="preserve">
+  <data name="&gt;&gt;RibbonPageConversations.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.Ribbon.RibbonPageCategory, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonPage3.Name" xml:space="preserve">
@ -1660,6 +1663,12 @@
  <data name="&gt;&gt;RibbonPage2.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="&gt;&gt;BarButtonItem5.Name" xml:space="preserve">
+    <value>BarButtonItem5</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem5.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmValidator</value>
  </data>
--- a/app/DD_PM_WINDREAM/frmValidator.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.vb
@ -11,6 +11,7 @@ Imports DigitalData.Controls.LookupGrid
 Imports DevExpress.XtraGrid
 Imports System.Reflection
 Imports DigitalData.Controls.ChatControl
+Imports DevExpress.XtraEditors.Repository

 Public Class frmValidator
    Dim strFileList()
@ -256,7 +257,7 @@ Public Class frmValidator
            End If

            oErrMsgMissingInput = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("frmValidator.MissingInput")
-            RibbonPageCategory1.Visible = False
+            RibbonPageConversations.Visible = False
            If IDB_ACTIVE Then
                Dim oSQL = $"SELECT * FROM [dbo].[FNIDB_OBJECT_DYNAMIC_CONFIG] ({CURRENT_DOC_ID},{USER_ID})"
                DTDYNAMIC_RIGHTS = ClassDatabase.Return_Datatable_ConStr(oSQL, CONNECTION_STRING_IDB, "FNIDB_OBJECT_DYNAMIC_CONFIG")
@ -266,7 +267,7 @@ Public Class frmValidator
                oView.RowFilter = "CONF_TITLE like '%CONVERSATION_%'"
                Debug.WriteLine(oView.Count, "oView after")
                If oView.Count > 0 Then
-                    RibbonPageCategory1.Visible = True
+                    RibbonPageConversations.Visible = True
                    bbtnitem_ConversationNew.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
                    bbtnitem_ConversationEnd.Visibility = DevExpress.XtraBars.BarItemVisibility.Never

@ -283,7 +284,6 @@ Public Class frmValidator
                                Case "Start"
                                    bbtnitem_ConversationNew.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
                                    Right_Conversation_Add = True
-
                                Case "Stop"
                                    bbtnitem_ConversationEnd.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
                                    Right_Conversation_Stop = True
@ -297,21 +297,12 @@ Public Class frmValidator
                    If DTConversations.Rows.Count > 0 Then
                        'CURRENT_DOC_ID
                        ChatControl1.Init(LOGCONFIG, CONNECTION_STRING_IDB, IIf(CONV_IDENTIFICATION = "Email", USER_EMAIL, USER_USERNAME), USER_USERNAME)
-                        ChatControl1.GetConversations(CURRENT_DOC_ID)
-                        Dim oConversations As List(Of String)
-                        oConversations = ChatControl1.GetConversations(CURRENT_DOC_ID)
-                        If oConversations.Count = 1 Then
-                            RibbonPageGroupConv_Change.Visible = True
-
-                        Else
-                            RibbonPageGroupConv_Change.Visible = False
-                            bbtnitem_ConversationEnd.Enabled = False
-                        End If
+                        Conversations_load()
                    Else

                    End If
                Else
-                    RibbonPageCategory1.Visible = False
+                    RibbonPageConversations.Visible = False
                End If


@ -354,6 +345,30 @@ Public Class frmValidator
        End Try

    End Sub
+    Sub Conversations_load()
+        ChatControl1.GetConversations(CURRENT_DOC_ID)
+        Dim oConversations As List(Of String)
+        oConversations = ChatControl1.GetConversations(CURRENT_DOC_ID)
+        If oConversations.Count = 1 Then
+
+            RibbonPageGroupConv_Change.Visible = False
+        Else
+            RepositoryItemComboBox3.Items.Clear()
+
+            RibbonPageGroupConv_Change.Visible = True
+            For Each oconv As String In oConversations
+                If Not oconv.EndsWith("Started") Then
+                    RepositoryItemComboBox3.Items.Add(oconv)
+                End If
+
+            Next
+        End If
+        If oConversations.Count >= 1 Then
+            If Right_Conversation_Stop = True Then
+                bbtnitem_ConversationEnd.Enabled = True
+            End If
+        End If
+    End Sub
    Private Sub frmValidation_FormClosing(sender As Object, e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
        Try
            me_closing = True
@ -2282,7 +2297,7 @@ Public Class frmValidator
                    End If
                    If check.ToString.Length > 0 And dr.Item("INDEX_NAME") <> "DD PM-ONLY FOR DISPLAY" Then
                        Dim cs As String = ClassDatabase.Get_ConnectionString(dr.Item("CONNECTION_ID"))
-                        If allgFunk.checkValue_Exists(dr.Item("SQL_UEBERPRUEFUNG"), "@Eingabe", control.Text, dr.Item("TYP"), cs, CURRENT_ProfilGUID) = True Then
+                        If allgFunk.CheckValue_Exists(dr.Item("SQL_UEBERPRUEFUNG"), "@Eingabe", control.Text, dr.Item("TYP"), cs, CURRENT_ProfilGUID) = True Then
                            Return True
                        Else
                            errormessage = "the input-value '" & control.Text & "' is not existing in database!"
@ -2402,21 +2417,21 @@ Public Class frmValidator
            LOGGER.Debug($"Checking file 0 [{oResult}] exists?...")
            WMDocPathWindows = String.Empty
            If File.Exists(oResult) = False Then
-                'If USER_USERNAME = "SchreiberM" Then
-                '    oResult = "\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\schreiberm\Desktop\AANG-3302-swbn.pdf"
-                'ElseIf USER_USERNAME = "Administrator" Then
-                '    'oResult = "C:\Users\Administrator.DD-GAN\Desktop\test.pdf"
-                '    oResult = "\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\schreiberm\Desktop\AANG-3302-swbn.pdf"
-                'Else
-                LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...")
-                oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({CURRENT_DOC_GUID},1)"
-                oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING, "GetDocPathWindows2")
-                LOGGER.Debug($"Checking file 1[{oResult}] exists?...")
-                If File.Exists(oResult) = False Then
-                    LOGGER.Warn($"GetDocPathWindows: File [{oResult}] not existing!")
-                    Return False
+                If USER_USERNAME = "SchreiberM" Then
+                    oResult = "\\windream\objects\Geschäftsprozesse\TEST.pdf"
+                    'ElseIf USER_USERNAME = "Administrator" Then
+                    '    'oResult = "C:\Users\Administrator.DD-GAN\Desktop\test.pdf"
+                    '    oResult = "\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\schreiberm\Desktop\AANG-3302-swbn.pdf"
+                Else
+                    LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...")
+                    oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({CURRENT_DOC_GUID},1)"
+                    oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING, "GetDocPathWindows2")
+                    LOGGER.Debug($"Checking file 1[{oResult}] exists?...")
+                    If File.Exists(oResult) = False Then
+                        LOGGER.Warn($"GetDocPathWindows: File [{oResult}] not existing!")
+                        Return False
+                    End If
                End If
-                'End If
            End If
            WMDocPathWindows = oResult
            OLD_Document_Path = WMDocPathWindows
@ -5342,10 +5357,8 @@ Public Class frmValidator
            Dim oResult = oForm.ShowDialog()

            If CURRENT_CONVERSATION_NEW <> 0 Then
-                ChatControl1.LoadConversation(CURRENT_CONVERSATION_NEW)
-                If Right_Conversation_Stop = True Then
-                    bbtnitem_ConversationEnd.Enabled = True
-                End If
+                Conversations_load()
+
            End If

        End If
@ -5353,4 +5366,38 @@ Public Class frmValidator

    End Sub

+    Private Sub bbtnitem_ConversationEnd_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitem_ConversationEnd.ItemClick
+        If ChatControl1.CurrentConversation <> 0 Then
+            Dim oQuestion As DataTable = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("frmValidator.Conversation_Delete")
+            If Not IsNothing(oQuestion) Then
+                If oQuestion.Rows.Count = 1 Then
+                    Dim result As MsgBoxResult
+                    result = MessageBox.Show(oQuestion.Rows(0).Item("STRING1").ToString, oQuestion.Rows(0).Item("STRING2").ToString, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation)
+                    If result = MsgBoxResult.Yes Then
+                        Dim oSQL = $"EXEC PRIDB_END_CONVERSATION {ChatControl1.CurrentConversation}, '{USER_USERNAME}', '{USER_LANGUAGE}'"
+                        If ClassDatabase.Execute_non_Query(oSQL, "EXEC PRIDB_END_CONVERSATION") = True Then
+                            bbtnitem_ConversationEnd.Enabled = False
+                            SplitContainer2_DV_Chat.Collapsed = True
+                        Else
+                            MsgBox("Unexpected error in PRIDB_END_CONVERSATION - Check Your log!", MsgBoxStyle.Exclamation)
+                        End If
+                    End If
+                End If
+            End If
+
+        End If
+    End Sub
+
+    Private Sub BarEditItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarEditItem3.ItemClick
+        Dim o = BarEditItem3.EditValue
+    End Sub
+
+    Private Sub RepositoryItemComboBox3_SelectedIndexChanged(sender As Object, e As EventArgs) Handles RepositoryItemComboBox3.SelectedIndexChanged
+
+        Dim cBox As DevExpress.XtraEditors.ComboBoxEdit = sender
+        Dim item = cBox.EditValue
+        Dim oSplit() = item.ToString.Split("|")
+        Dim oConvID = oSplit(0)
+        ChatControl1.LoadConversation(oConvID)
+    End Sub
 End Class