diff --git a/app/DD_PM_WINDREAM/ClassParamRefresh.vb b/app/DD_PM_WINDREAM/ClassParamRefresh.vb index e5b5116..d12cffa 100644 --- a/app/DD_PM_WINDREAM/ClassParamRefresh.vb +++ b/app/DD_PM_WINDREAM/ClassParamRefresh.vb @@ -63,6 +63,9 @@ RIBBON_COLOR_SCHEME = oColorScheme.ToUpper ElseIf oMode.StartsWith("PM.NO_DETAIL_PROFILES") Then NO_DETAIL_PROFILES = True + ElseIf oMode.StartsWith("PM.CONV_IDENTIFICATION") Then + Dim oIdent = oMode.Replace("PM.CONV_IDENTIFICATION=", "") + CONV_IDENTIFICATION = oIdent Else LOGGER.Info($"Wrong oMode: {oMode}") End If diff --git a/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb b/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb index 294400d..e57306e 100644 --- a/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb +++ b/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb @@ -221,11 +221,16 @@ LOGGER.Error(ex) End Function Public Function GetTypeOfIndex(ByVal indexname As String) As Integer Try + If IsNothing(Me.oSession) Then + LOGGER.Warn("GetTypeOfIndex: WMSession is nothing") + Return Nothing + End If Dim oAttribute = Me.oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, indexname) Dim vType = oAttribute.getVariableValue("dwAttrType") Return vType Catch ex As Exception -LOGGER.Error(ex) + Dim omsg = $"Unexpected error in GetTypeOfIndex [{indexname}]: {ex.Message}" + LOGGER.Warn(omsg) Return Nothing End Try @@ -273,6 +278,10 @@ LOGGER.Error(ex) ''' Public Function GetIndicesByObjecttype(ByVal Objecttype_name As String) As String() Try + If IsNothing(Me.oSession) Then + LOGGER.Warn("GetIndicesByObjecttype: WMSession is nothing") + Return Nothing + End If Dim oObjectType As WMObject Dim oIndexAttributes As WMObjectRelation Dim oIndexAttribute As WMObject @@ -309,7 +318,7 @@ LOGGER.Error(ex) Return aIndexNames Catch ex As Exception -LOGGER.Error(ex) + LOGGER.Error(ex) MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler beim Auslesen der windream-Indexe") Return Nothing End Try @@ -322,6 +331,10 @@ LOGGER.Error(ex) ''' Public Function GetObjecttypeByName(ByVal objekttypName As String) As WMObject Try + If IsNothing(Me.oSession) Then + LOGGER.Warn("GetObjecttypeByName: WMSession is nothing") + Return Nothing + End If ' alle Objekttypen auslesen Dim oObjectTypes As WMObjects = Me.oSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument) @@ -335,7 +348,7 @@ LOGGER.Error(ex) Return Nothing Catch ex As Exception -LOGGER.Error(ex) + LOGGER.Error(ex) MsgBox("Es konnte ein Objekttyp nicht erstellt werden." & vbNewLine & vbNewLine & "Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation, "Objekttyp konnte nicht erstellt werden") Return Nothing End Try diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj index bb75c9a..2593c0f 100644 --- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj +++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj @@ -139,6 +139,12 @@ False + + ..\..\..\DDMonorepo\Controls.ChatControl\bin\Debug\DigitalData.Controls.ChatControl.dll + + + ..\..\..\DDMonorepo\Controls.ChatNewConv\bin\Debug\DigitalData.Controls.ChatNewConv.dll + False ..\..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll @@ -150,6 +156,7 @@ ..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll + ..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll @@ -294,6 +301,12 @@ Form + + frmChat_NewConversation.vb + + + Form + frmClientLogin.vb @@ -517,6 +530,9 @@ frmAnnotations.vb + + frmChat_NewConversation.vb + frmClientLogin.vb diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index edbceb1..30cc845 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -27,6 +27,8 @@ Module ModuleRuntimeVariables Public CURRENT_DOC_CREATION_DATE As String Public CURRENT_DOC_CREATION_TIME As String + Public CURRENT_CONVERSATION_NEW As Long + Public CURRENT_CONN_ID As Integer Public CURRENT_JUMP_DOC_GUID As Integer @@ -65,6 +67,7 @@ Module ModuleRuntimeVariables Public MONITORING_ACTIVE As Boolean = False Public RIBBON_COLOR_SCHEME As String = "Blue" Public ADDITIONAL_TITLE As String = "" + Public CONV_IDENTIFICATION As String = "Username" Public LICENSE_COUNT As Integer = 0 Public LICENSE_EXPIRED As Boolean = False diff --git a/app/DD_PM_WINDREAM/My Project/licenses.licx b/app/DD_PM_WINDREAM/My Project/licenses.licx index d6e41f5..12c0744 100644 --- a/app/DD_PM_WINDREAM/My Project/licenses.licx +++ b/app/DD_PM_WINDREAM/My Project/licenses.licx @@ -1,15 +1,16 @@ -DevExpress.XtraPrinting.Preview.DocumentViewer, DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraPrinting.Preview.DocumentViewer, DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD_PM_WINDREAM/frmAdmin2.resx b/app/DD_PM_WINDREAM/frmAdmin2.resx index 247e57f..0ff5837 100644 --- a/app/DD_PM_WINDREAM/frmAdmin2.resx +++ b/app/DD_PM_WINDREAM/frmAdmin2.resx @@ -509,7 +509,7 @@ Phrasen Verwaltung - Aktionen + Start 1059, 146 diff --git a/app/DD_PM_WINDREAM/frmChat_NewConversation.Designer.vb b/app/DD_PM_WINDREAM/frmChat_NewConversation.Designer.vb new file mode 100644 index 0000000..af5005d --- /dev/null +++ b/app/DD_PM_WINDREAM/frmChat_NewConversation.Designer.vb @@ -0,0 +1,52 @@ + _ +Partial Class frmChat_NewConversation + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.ChatNewConv1 = New DigitalData.Controls.ChatNewConv.ChatNewConv() + Me.SuspendLayout() + ' + 'ChatNewConv1 + ' + Me.ChatNewConv1.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ChatNewConv1.Location = New System.Drawing.Point(2, 1) + Me.ChatNewConv1.Name = "ChatNewConv1" + Me.ChatNewConv1.Size = New System.Drawing.Size(463, 472) + Me.ChatNewConv1.TabIndex = 0 + ' + 'frmChat_NewConversation + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(474, 480) + Me.Controls.Add(Me.ChatNewConv1) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "frmChat_NewConversation" + Me.Text = "Neue Konversation" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ChatNewConv1 As DigitalData.Controls.ChatNewConv.ChatNewConv +End Class diff --git a/app/DD_PM_WINDREAM/frmChat_NewConversation.resx b/app/DD_PM_WINDREAM/frmChat_NewConversation.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/app/DD_PM_WINDREAM/frmChat_NewConversation.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmChat_NewConversation.vb b/app/DD_PM_WINDREAM/frmChat_NewConversation.vb new file mode 100644 index 0000000..314b622 --- /dev/null +++ b/app/DD_PM_WINDREAM/frmChat_NewConversation.vb @@ -0,0 +1,24 @@ +Public Class frmChat_NewConversation + Public Property NewConversation() As String + Get + Return oNewConversation + End Get + Set(value As String) + oNewConversation = value + End Set + End Property + Public oNewConversation As Long + Public Sub New(oDTUsers As DataTable, oDTGroups As DataTable) + + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + ChatNewConv1.Init(LOGCONFIG, CONNECTION_STRING_IDB, CURRENT_DOC_ID, USER_USERNAME, USER_LANGUAGE, oDTUsers, oDTGroups) + AddHandler ChatNewConv1.Conversation_Created, AddressOf onConversationCreated + End Sub + Sub onConversationCreated() + CURRENT_CONVERSATION_NEW = ChatNewConv1.NewConversation + Me.Close() + End Sub +End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index fae1cc4..87971ef 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -1468,7 +1468,7 @@ Public Class frmMain 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("(LoadGridOverview)Column [Last edited] or [Zuletzt bearbeitet] not part of OverviewSQL") + LOGGER.Warn("(Warning LoadGridOverview)Column [Last edited] or [Zuletzt bearbeitet] not part of OverviewSQL") End Try End Try diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb index e174305..924b5dd 100644 --- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb @@ -24,6 +24,7 @@ Partial Class frmValidator Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmValidator)) + Me.SplitContainer2_DV_Chat = New DevExpress.XtraEditors.SplitContainerControl() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() Me.Panel1 = New System.Windows.Forms.Panel() Me.TITLELabel1 = New System.Windows.Forms.Label() @@ -31,6 +32,7 @@ Partial Class frmValidator Me.DESCRIPTIONLabel = New System.Windows.Forms.Label() Me.pnldesigner = New System.Windows.Forms.Panel() Me.DocumentViewerValidator = New DigitalData.Controls.DocumentViewer.DocumentViewer() + Me.ChatControl1 = New DigitalData.Controls.ChatControl.ChatControl() Me.BarAndDockingController3 = New DevExpress.XtraBars.BarAndDockingController(Me.components) Me.BarAndDockingController2 = New DevExpress.XtraBars.BarAndDockingController(Me.components) Me.BarAndDockingController1 = New DevExpress.XtraBars.BarAndDockingController(Me.components) @@ -82,12 +84,28 @@ Partial Class frmValidator Me.bsiInfo2 = New DevExpress.XtraBars.BarStaticItem() Me.BbtnItm = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarLinkContainerItem1 = New DevExpress.XtraBars.BarLinkContainerItem() + Me.bbtnitem_ConversationEnd = New DevExpress.XtraBars.BarButtonItem() + Me.bbtnitem_ConversationNew = New DevExpress.XtraBars.BarButtonItem() + Me.BarLinkContainerItem2 = New DevExpress.XtraBars.BarLinkContainerItem() + Me.BarEditItem1 = New DevExpress.XtraBars.BarEditItem() + Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() + Me.BarEditItem2 = New DevExpress.XtraBars.BarEditItem() + 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.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroupConv1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroupConv_Change = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageFile = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + CType(Me.SplitContainer2_DV_Chat, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainer2_DV_Chat.SuspendLayout() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() @@ -100,8 +118,23 @@ Partial Class frmValidator CType(Me.PdfBarController1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PdfBarController2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemComboBox2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemComboBox3, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' + 'SplitContainer2_DV_Chat + ' + Me.SplitContainer2_DV_Chat.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 + resources.ApplyResources(Me.SplitContainer2_DV_Chat, "SplitContainer2_DV_Chat") + 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") + Me.SplitContainer2_DV_Chat.Panel2.Controls.Add(Me.ChatControl1) + Me.SplitContainer2_DV_Chat.SplitterPosition = 919 + ' 'SplitContainer1 ' resources.ApplyResources(Me.SplitContainer1, "SplitContainer1") @@ -155,6 +188,11 @@ Partial Class frmValidator resources.ApplyResources(Me.DocumentViewerValidator, "DocumentViewerValidator") Me.DocumentViewerValidator.Name = "DocumentViewerValidator" ' + 'ChatControl1 + ' + resources.ApplyResources(Me.ChatControl1, "ChatControl1") + Me.ChatControl1.Name = "ChatControl1" + ' 'BarAndDockingController3 ' Me.BarAndDockingController3.PropertiesBar.AllowLinkLighting = False @@ -407,11 +445,13 @@ 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.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}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") - Me.RibbonControl1.MaxItemId = 18 + Me.RibbonControl1.MaxItemId = 25 Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategory1}) 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] Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' @@ -544,6 +584,96 @@ Partial Class frmValidator Me.BarButtonItem2.Id = 17 Me.BarButtonItem2.Name = "BarButtonItem2" ' + 'BarLinkContainerItem1 + ' + resources.ApplyResources(Me.BarLinkContainerItem1, "BarLinkContainerItem1") + Me.BarLinkContainerItem1.Id = 18 + Me.BarLinkContainerItem1.Name = "BarLinkContainerItem1" + ' + 'bbtnitem_ConversationEnd + ' + resources.ApplyResources(Me.bbtnitem_ConversationEnd, "bbtnitem_ConversationEnd") + Me.bbtnitem_ConversationEnd.Id = 19 + Me.bbtnitem_ConversationEnd.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitem_ConversationEnd.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.bbtnitem_ConversationEnd.Name = "bbtnitem_ConversationEnd" + ' + 'bbtnitem_ConversationNew + ' + resources.ApplyResources(Me.bbtnitem_ConversationNew, "bbtnitem_ConversationNew") + Me.bbtnitem_ConversationNew.Id = 20 + Me.bbtnitem_ConversationNew.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitem_ConversationNew.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.bbtnitem_ConversationNew.Name = "bbtnitem_ConversationNew" + ' + 'BarLinkContainerItem2 + ' + resources.ApplyResources(Me.BarLinkContainerItem2, "BarLinkContainerItem2") + Me.BarLinkContainerItem2.Id = 21 + Me.BarLinkContainerItem2.Name = "BarLinkContainerItem2" + ' + 'BarEditItem1 + ' + resources.ApplyResources(Me.BarEditItem1, "BarEditItem1") + Me.BarEditItem1.Edit = Me.RepositoryItemComboBox1 + Me.BarEditItem1.Id = 22 + Me.BarEditItem1.Name = "BarEditItem1" + ' + 'RepositoryItemComboBox1 + ' + resources.ApplyResources(Me.RepositoryItemComboBox1, "RepositoryItemComboBox1") + Me.RepositoryItemComboBox1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemComboBox1.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.RepositoryItemComboBox1.Name = "RepositoryItemComboBox1" + ' + 'BarEditItem2 + ' + resources.ApplyResources(Me.BarEditItem2, "BarEditItem2") + Me.BarEditItem2.Edit = Me.RepositoryItemComboBox2 + Me.BarEditItem2.Id = 23 + Me.BarEditItem2.Name = "BarEditItem2" + ' + 'RepositoryItemComboBox2 + ' + resources.ApplyResources(Me.RepositoryItemComboBox2, "RepositoryItemComboBox2") + Me.RepositoryItemComboBox2.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemComboBox2.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.RepositoryItemComboBox2.Name = "RepositoryItemComboBox2" + ' + 'BarEditItem3 + ' + resources.ApplyResources(Me.BarEditItem3, "BarEditItem3") + Me.BarEditItem3.Edit = Me.RepositoryItemComboBox3 + Me.BarEditItem3.Id = 24 + Me.BarEditItem3.Name = "BarEditItem3" + ' + 'RepositoryItemComboBox3 + ' + resources.ApplyResources(Me.RepositoryItemComboBox3, "RepositoryItemComboBox3") + 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 + ' + Me.RibbonPageCategory1.Name = "RibbonPageCategory1" + Me.RibbonPageCategory1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage3}) + resources.ApplyResources(Me.RibbonPageCategory1, "RibbonPageCategory1") + ' + 'RibbonPage3 + ' + Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroupConv1, Me.RibbonPageGroupConv_Change}) + Me.RibbonPage3.Name = "RibbonPage3" + resources.ApplyResources(Me.RibbonPage3, "RibbonPage3") + ' + 'RibbonPageGroupConv1 + ' + Me.RibbonPageGroupConv1.ItemLinks.Add(Me.bbtnitem_ConversationNew) + Me.RibbonPageGroupConv1.ItemLinks.Add(Me.bbtnitem_ConversationEnd) + Me.RibbonPageGroupConv1.Name = "RibbonPageGroupConv1" + resources.ApplyResources(Me.RibbonPageGroupConv1, "RibbonPageGroupConv1") + ' + 'RibbonPageGroupConv_Change + ' + Me.RibbonPageGroupConv_Change.ItemLinks.Add(Me.BarEditItem3) + Me.RibbonPageGroupConv_Change.Name = "RibbonPageGroupConv_Change" + resources.ApplyResources(Me.RibbonPageGroupConv_Change, "RibbonPageGroupConv_Change") + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageFile, Me.RibbonPageGroup3, Me.RibbonPageGroup2}) @@ -599,7 +729,7 @@ Partial Class frmValidator Me.Appearance.Options.UseFont = True resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.SplitContainer1) + Me.Controls.Add(Me.SplitContainer2_DV_Chat) Me.Controls.Add(Me.RibbonControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.barDockControlLeft) @@ -612,6 +742,8 @@ Partial Class frmValidator Me.Name = "frmValidator" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 + CType(Me.SplitContainer2_DV_Chat, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainer2_DV_Chat.ResumeLayout(False) Me.SplitContainer1.Panel1.ResumeLayout(False) Me.SplitContainer1.Panel2.ResumeLayout(False) CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() @@ -624,11 +756,13 @@ Partial Class frmValidator CType(Me.PdfBarController1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PdfBarController2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemComboBox2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemComboBox3, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents Panel1 As System.Windows.Forms.Panel Friend WithEvents TITLELabel1 As System.Windows.Forms.Label Friend WithEvents btnSave As System.Windows.Forms.Button Friend WithEvents DESCRIPTIONLabel As System.Windows.Forms.Label @@ -692,4 +826,21 @@ Partial Class frmValidator Friend WithEvents DocumentViewerValidator As DigitalData.Controls.DocumentViewer.DocumentViewer Friend WithEvents BbtnItm As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents Panel1 As Panel + Friend WithEvents SplitContainer2_DV_Chat As DevExpress.XtraEditors.SplitContainerControl + 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 RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroupConv1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents BarLinkContainerItem2 As DevExpress.XtraBars.BarLinkContainerItem + Friend WithEvents BarEditItem1 As DevExpress.XtraBars.BarEditItem + Friend WithEvents RepositoryItemComboBox1 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox + Friend WithEvents BarEditItem2 As DevExpress.XtraBars.BarEditItem + Friend WithEvents RepositoryItemComboBox2 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox + Friend WithEvents RibbonPageGroupConv_Change As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents BarEditItem3 As DevExpress.XtraBars.BarEditItem + Friend WithEvents RepositoryItemComboBox3 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox + Friend WithEvents ChatControl1 As DigitalData.Controls.ChatControl.ChatControl End Class diff --git a/app/DD_PM_WINDREAM/frmValidator.resx b/app/DD_PM_WINDREAM/frmValidator.resx index fdb56a2..282a7b2 100644 --- a/app/DD_PM_WINDREAM/frmValidator.resx +++ b/app/DD_PM_WINDREAM/frmValidator.resx @@ -118,13 +118,19 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Fill - + 0, 146 + + Fill + + + 0, 0 + Top, Left, Right @@ -138,7 +144,7 @@ No - 565, 29 + 433, 29 @@ -178,7 +184,7 @@ 3, 4, 3, 4 - 577, 50 + 445, 50 11 @@ -205,7 +211,7 @@ 5, 33 - 579, 48 + 447, 48 1 @@ -238,7 +244,7 @@ 3, 4, 3, 4 - 576, 366 + 444, 366 18 @@ -265,7 +271,7 @@ 3, 4, 3, 4 - 587, 516 + 455, 516 24 @@ -304,7 +310,7 @@ 3, 4, 3, 4 - 594, 516 + 460, 516 0 @@ -334,10 +340,10 @@ 1 - 1185, 516 + 919, 516 - 587 + 455 37 @@ -349,11 +355,68 @@ System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - $this + SplitContainer2_DV_Chat.SplitContainer2_DV_Chat_Panel1 0 + + Panel1 + + + True + + + Fill + + + Tahoma, 9.75pt + + + 0, 0 + + + 3, 4, 3, 4 + + + 254, 516 + + + 0 + + + ChatControl1 + + + DigitalData.Controls.ChatControl.ChatControl, DigitalData.Controls.ChatControl, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + SplitContainer2_DV_Chat.SplitContainer2_DV_Chat_Panel2 + + + 0 + + + Panel2 + + + 1185, 516 + + + 44 + + + SplitContainer2_DV_Chat + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 0 + 17, 17 @@ -833,9 +896,100 @@ BarButtonItem2 + + Konversationen + + + Beende Konversation + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANcCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkZvcmJpZCI+DQogICAgPHBhdGggZD0iTTE2LDRDOS40 + LDQsNCw5LjQsNCwxNnM1LjQsMTIsMTIsMTJzMTItNS40LDEyLTEyUzIyLjYsNCwxNiw0eiBNMTYsOGMx + LjUsMCwyLjksMC40LDQuMSwxLjFsLTExLDExICAgQzguNCwxOC45LDgsMTcuNSw4LDE2QzgsMTEuNiwx + MS42LDgsMTYsOHogTTE2LDI0Yy0xLjUsMC0yLjgtMC40LTQtMS4xTDIyLjksMTJjMC43LDEuMiwxLjEs + Mi41LDEuMSw0QzI0LDIwLjQsMjAuNCwyNCwxNiwyNHoiIGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwv + c3ZnPgs= + + + + Neue Konversation + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGICAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFkZENpcmNsZWQiPg0KICAgIDxwYXRoIGQ9Ik0xNiw0 + QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHogTTI0 + LDE4aC02djZoLTR2LTZIOHYtNGg2VjhoNHY2aDZWMTh6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4N + Cjwvc3ZnPgs= + + + + BarLinkContainerItem2 + + + Auswahl + + + False + + + + Combo + + + Auswahl + + + False + + + Combo + + + BarEditItem3 + + + False + + + Combo + 0, 0 + + Aktionen + + + Wechsel + + + Start + + + Konversationen + Datei @@ -1392,6 +1546,90 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarLinkContainerItem1 + + + DevExpress.XtraBars.BarLinkContainerItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + bbtnitem_ConversationEnd + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + bbtnitem_ConversationNew + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarLinkContainerItem2 + + + DevExpress.XtraBars.BarLinkContainerItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarEditItem1 + + + DevExpress.XtraBars.BarEditItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RepositoryItemComboBox1 + + + DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarEditItem2 + + + DevExpress.XtraBars.BarEditItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RepositoryItemComboBox2 + + + DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarEditItem3 + + + DevExpress.XtraBars.BarEditItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RepositoryItemComboBox3 + + + DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageCategory1 + + + DevExpress.XtraBars.Ribbon.RibbonPageCategory, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPage3 + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroupConv1 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroupConv_Change + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 @@ -1431,7 +1669,6 @@ Öffnen - AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxOS4yLCBWZXJzaW9uPTE5LjIu diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index e5f8103..a229df8 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -10,6 +10,7 @@ Imports DD_LIB_Standards Imports DigitalData.Controls.LookupGrid Imports DevExpress.XtraGrid Imports System.Reflection +Imports DigitalData.Controls.ChatControl Public Class frmValidator Dim strFileList() @@ -18,7 +19,7 @@ Public Class frmValidator Dim PROFIL_FINISH_SQL Dim PROFIL_LOGINDEX - Dim oErrorMessage + Dim oErrMsgMissingInput Private PMDelimiter As String @@ -58,6 +59,12 @@ Public Class frmValidator Private DTGRID_COLUMNS_WITH_SQL As DataTable Private DTGRID_COLUMNS As DataTable Private DTGRID_SQL_DEFINITION As DataTable + Private DTConversations As DataTable + Private DTDYNAMIC_RIGHTS As DataTable + + Private Right_Conversation_Add As Boolean = False + Private Right_Conversation_Stop As Boolean = False + Private Right_Conversation_Message As Boolean = False Public FormLoaded As Boolean = False Private ItemWorked As Boolean = False @@ -248,8 +255,96 @@ Public Class frmValidator End If End If - oErrorMessage = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("frmValidator.MissingInput") + oErrMsgMissingInput = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("frmValidator.MissingInput") + RibbonPageCategory1.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") + RibbonPageGroupConv1.Enabled = False + Dim oView As DataView = New DataView(DTDYNAMIC_RIGHTS) + Debug.WriteLine(oView.Count, "oView before") + oView.RowFilter = "CONF_TITLE like '%CONVERSATION_%'" + Debug.WriteLine(oView.Count, "oView after") + If oView.Count > 0 Then + RibbonPageCategory1.Visible = True + bbtnitem_ConversationNew.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + bbtnitem_ConversationEnd.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + Dim oConvRightStart + For Each oRow As DataRow In DTDYNAMIC_RIGHTS.Rows + If oRow.Item("CONF_TITLE").ToString.Contains("CONVERSATION_") Then + RibbonPageGroupConv1.Enabled = True + Select Case oRow.Item("CONF_VALUE") + Case "Start|Stop" + bbtnitem_ConversationNew.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + bbtnitem_ConversationEnd.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + Right_Conversation_Add = True + Right_Conversation_Stop = True + 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 + End Select + End If + + Next + + oSQL = $"select * From VWIDB_CONVERSATION where IDB_OBJ_ID = {CURRENT_DOC_ID} and CONVERSATION_STATE = 'Started'" + DTConversations = ClassDatabase.Return_Datatable_ConStr(oSQL, CONNECTION_STRING_IDB, "ValidatorLoad-GetConversations") + 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 + Else + + End If + Else + RibbonPageCategory1.Visible = False + End If + + + 'If Not IsNothing(DTConversations) Then + ' If DTConversations.Rows.Count >= 1 Then + + ' SplitContainerMain.Collapsed = False + ' Dim oConversations As List(Of String) + ' oConversations = ChatControl1.GetConversations(CURRENT_DOC_ID) + ' If oConversations.Count > 1 Then + ' RibbonPageGroupConv_Change.Visible = True + ' For Each oit As String In oConversations + ' ' Dim Coll As ComboBoxItemCollection = RepositoryItemComboBox3.Properties.Items + + ' BarEditItem2..Items.Add(oit) + ' Next + + + ' Else + ' RibbonPageGroupConv_Change.Visible = False + ' End If + ' Else + + ' End If + 'Else + ' SplitContainerMain.Collapsed = True + + 'End If + + Else + SplitContainer2_DV_Chat.Collapsed = True + + End If LOGGER.Debug("frmValidation_Load finished!") Catch ex As Exception LOGGER.Error(ex) @@ -309,86 +404,91 @@ Public Class frmValidator End Sub Public Sub Load_Additional_Searches() - If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Or BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then - Dim oDocResultCommand As String - Dim oDatatableDocResult As DataTable - Dim oDataResultCommand As String - Dim oDatatableDataResult As DataTable - If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then - 'Check whether DocData is there - Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID") - oDataResultCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND") - oDataResultCommand = clsPatterns.ReplaceAllValues(oDataResultCommand, pnldesigner, True) - oDatatableDataResult = ClassDatabase.Return_Datatable_ConId(oDataResultCommand, oConID, "Load_Additional_Searches1") - End If - If BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then - 'Check whether DocData is there - Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID") - oDocResultCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND") - oDocResultCommand = clsPatterns.ReplaceAllValues(oDocResultCommand, pnldesigner, True) - oDatatableDocResult = ClassDatabase.Return_Datatable_ConId(oDocResultCommand, oConID, "Load_Additional_Searches2") - End If - - Dim oDataResultsExist As Boolean = False - Dim oDocResultsExist As Boolean = False - - If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then - If Not IsNothing(oDatatableDataResult) Then - If oDatatableDataResult.Rows.Count > 0 Then - oDataResultsExist = True - End If - End If - - End If - If BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then - If Not IsNothing(oDatatableDocResult) Then - If oDatatableDocResult.Rows.Count > 0 Then - oDocResultsExist = True - End If - End If - End If - - If oDataResultsExist = True Or oDocResultsExist = True Then - bbtniRefreshSearches.Visibility = DevExpress.XtraBars.BarItemVisibility.Always - _frmValidatorSearch.Show() - Dim oPnl1Collapsed As Boolean = True - Dim oPnl2Collapsed As Boolean = True - If oDataResultsExist = True Then - oPnl1Collapsed = False - Else - oPnl1Collapsed = True - End If - If oDocResultsExist = True Then - oPnl2Collapsed = False - Else - oPnl2Collapsed = True - End If - _frmValidatorSearch.TabPreload(oPnl1Collapsed, oPnl2Collapsed, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count, - BASEDATA_DT_PROFILE_SEARCHES_SQL, BASEDATA_DT_PROFILE_SEARCHES_DOC) - If oDataResultsExist Then - _frmValidatorSearch._DTSQLSearches = BASEDATA_DT_PROFILE_SEARCHES_SQL + Try + If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Or BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then + Dim oDocResultCommand As String + Dim oDatatableDocResult As DataTable + Dim oDataResultCommand As String + Dim oDatatableDataResult As DataTable + If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then + 'Check whether DocData is there Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID") - Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND") - oCommand = clsPatterns.ReplaceAllValues(oCommand, pnldesigner, True) - - _frmValidatorSearch.Refresh_Load_GridSQL(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("TAB_TITLE")) + oDataResultCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND") + oDataResultCommand = clsPatterns.ReplaceAllValues(oDataResultCommand, pnldesigner, True) + oDatatableDataResult = ClassDatabase.Return_Datatable_ConId(oDataResultCommand, oConID, "Load_Additional_Searches1") End If - If oDocResultsExist Then - _frmValidatorSearch._DTDocSearches = BASEDATA_DT_PROFILE_SEARCHES_DOC + If BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then + 'Check whether DocData is there Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID") - Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND") - oCommand = clsPatterns.ReplaceAllValues(oCommand, pnldesigner, True) + oDocResultCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND") + oDocResultCommand = clsPatterns.ReplaceAllValues(oDocResultCommand, pnldesigner, True) + oDatatableDocResult = ClassDatabase.Return_Datatable_ConId(oDocResultCommand, oConID, "Load_Additional_Searches2") + End If - _frmValidatorSearch.RefreshTabDoc(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("TAB_TITLE")) + Dim oDataResultsExist As Boolean = False + Dim oDocResultsExist As Boolean = False + + If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then + If Not IsNothing(oDatatableDataResult) Then + If oDatatableDataResult.Rows.Count > 0 Then + oDataResultsExist = True + End If + End If + + End If + If BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then + If Not IsNothing(oDatatableDocResult) Then + If oDatatableDocResult.Rows.Count > 0 Then + oDocResultsExist = True + End If + End If + End If + + If oDataResultsExist = True Or oDocResultsExist = True Then + bbtniRefreshSearches.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + _frmValidatorSearch.Show() + Dim oPnl1Collapsed As Boolean = True + Dim oPnl2Collapsed As Boolean = True + If oDataResultsExist = True Then + oPnl1Collapsed = False + Else + oPnl1Collapsed = True + End If + If oDocResultsExist = True Then + oPnl2Collapsed = False + Else + oPnl2Collapsed = True + End If + _frmValidatorSearch.TabPreload(oPnl1Collapsed, oPnl2Collapsed, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count, + BASEDATA_DT_PROFILE_SEARCHES_SQL, BASEDATA_DT_PROFILE_SEARCHES_DOC) + If oDataResultsExist Then + _frmValidatorSearch._DTSQLSearches = BASEDATA_DT_PROFILE_SEARCHES_SQL + Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID") + Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND") + oCommand = clsPatterns.ReplaceAllValues(oCommand, pnldesigner, True) + + _frmValidatorSearch.Refresh_Load_GridSQL(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("TAB_TITLE")) + End If + If oDocResultsExist Then + _frmValidatorSearch._DTDocSearches = BASEDATA_DT_PROFILE_SEARCHES_DOC + Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID") + Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND") + oCommand = clsPatterns.ReplaceAllValues(oCommand, pnldesigner, True) + + _frmValidatorSearch.RefreshTabDoc(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("TAB_TITLE")) + End If + Else + LOGGER.Info("Not loading AdditionalSearches...!") + bbtniRefreshSearches.Visibility = DevExpress.XtraBars.BarItemVisibility.Never End If Else LOGGER.Info("Not loading AdditionalSearches...!") bbtniRefreshSearches.Visibility = DevExpress.XtraBars.BarItemVisibility.Never End If - Else - LOGGER.Info("Not loading AdditionalSearches...!") - bbtniRefreshSearches.Visibility = DevExpress.XtraBars.BarItemVisibility.Never - End If + Catch ex As Exception + MsgBox(ex.Message) + End Try + End Sub Sub LoadSQLData(control As Control, pControlId As Integer) Try @@ -814,29 +914,32 @@ Public Class frmValidator oMyControl = lookup 'Wenn Multiselect false dann prüfen ob abhängiges Control If CBool(oControlRow.Item("MULTISELECT")) = False Then - Dim filteredData As DataTable = DTCONTROLS.Clone() + Dim oFilteredData As DataTable = DTCONTROLS.Clone() Dim oExpression = $"SQL_UEBERPRUEFUNG like '%#CTRL#{oMyControl.Name}%'" - DTCONTROLS.Select(oExpression).CopyToDataTable(filteredData, LoadOption.PreserveChanges) - If filteredData.Rows.Count = 1 Then + DTCONTROLS.Select(oExpression).CopyToDataTable(oFilteredData, LoadOption.PreserveChanges) + If oFilteredData.Rows.Count >= 1 Then + LOGGER.Debug($"createControlsLU - Found {oFilteredData.Rows.Count} Controls which are depending on {oMyControl.Name}") 'AddHandler lookup.EditValueChanged, AddressOf onLookUp1 AddHandler lookup.SelectedValuesChanged, AddressOf onLookUpselectedValue - Else - oExpression = $"SQL_ENABLE like '%#CTRL#{oMyControl.Name}%'" - DTCONTROLS.Select(oExpression).CopyToDataTable(filteredData, LoadOption.PreserveChanges) - If filteredData.Rows.Count = 1 Then - 'AddHandler lookup.EditValueChanged, AddressOf onLookUp1 - AddHandler lookup.SelectedValuesChanged, AddressOf onLookUpselectedValue - End If End If - filteredData = DTCONTROLS.Clone() + oExpression = $"SQL_ENABLE like '%#CTRL#{oMyControl.Name}%'" + DTCONTROLS.Select(oExpression).CopyToDataTable(oFilteredData, LoadOption.PreserveChanges) + If oFilteredData.Rows.Count >= 1 Then + LOGGER.Debug($"createControlsLU - Found {oFilteredData.Rows.Count} Controls which' enable state is depending on {oMyControl.Name}") + 'AddHandler lookup.EditValueChanged, AddressOf onLookUp1 + AddHandler lookup.SelectedValuesChanged, AddressOf onLookUpselectedValue + End If + + + oFilteredData = DTCONTROLS.Clone() oExpression = $"GUID = {oControlRow.Item("GUID")} and Len(SET_CONTROL_DATA) > 0" - DTCONTROLS.Select(oExpression).CopyToDataTable(filteredData, LoadOption.PreserveChanges) - If filteredData.Rows.Count = 1 Then + DTCONTROLS.Select(oExpression).CopyToDataTable(oFilteredData, LoadOption.PreserveChanges) + If oFilteredData.Rows.Count = 1 Then 'AddHandler lookup.EditValueChanged, AddressOf onLookUp1 AddHandler lookup.SelectedValuesChanged, AddressOf onLookUpselectedValue_Control2Set End If - filteredData = DTCONTROLS.Clone() + oFilteredData = DTCONTROLS.Clone() End If @@ -1333,7 +1436,7 @@ Public Class frmValidator LookupControl_EnablingControls(oLookup, SelectedValues) LookupControl_DependingColumn(oLookup, SelectedValues) Else - LOGGER.Debug("Uups: SelectedValues.Count <> 1 ") + LOGGER.Debug("Uups onLookUpselectedValue: SelectedValues.Count <> 1 ") End If End If Catch ex As Exception @@ -1857,7 +1960,7 @@ Public Class frmValidator End Sub Private Sub LookupControl_EnablingControls(LookupControl As LookupControl2, SelectedValues As List(Of String)) Dim oLOOKUPValue = SelectedValues.Item(0) - LOGGER.Debug($"oLOOKUPValue is [{oLOOKUPValue}]!") + LOGGER.Debug($"LookupControl_EnablingControls [{LookupControl.Name()}] - oLOOKUPValue is [{oLOOKUPValue}]!") Dim oControlID = DirectCast(LookupControl.Tag, ClassControlCreator.ControlMetadata).Guid Controls2beEnabled(LookupControl.Name) @@ -2009,7 +2112,7 @@ Public Class frmValidator For Each oRowEnablingControl As DataRow In oFilteredDatatable.Rows Dim oENABLE_GUID = oRowEnablingControl.Item("GUID") Dim oENABLE_CtrlName = oRowEnablingControl.Item("NAME") - LOGGER.Debug($"Control {oENABLE_CtrlName} is depending on lookUp {pControlName}..") + LOGGER.Debug($"Control {oENABLE_CtrlName} is depending on Control: {pControlName}..") If _dependingControl_in_action = True Then LOGGER.Debug($"..but _dependingControl_in_action = True ==> Exit Sub!") Exit Sub @@ -2254,7 +2357,7 @@ Public Class frmValidator Return newGUID Catch ex As Exception LOGGER.Error(ex) - oErrorMessage = "Unexpected error in Get_Next_GUID: " & ex.Message + oErrMsgMissingInput = "Unexpected error in Get_Next_GUID: " & ex.Message LOGGER.Info(">> Unexpected error in Get_Next_GUID:: " & ex.Message, True) Return 0 End Try @@ -2349,7 +2452,7 @@ Public Class frmValidator CURRENT_WMFILE = Nothing activate_controls(False) - oErrorMessage = "" + oErrMsgMissingInput = "" WMDocPathWindows = "" WMDocFileString = "" @@ -2413,14 +2516,14 @@ Public Class frmValidator LOGGER.Debug("AllDocInfo created...") If IDB_ACTIVE = False Then - oErrorMessage = Windream_get_Doc_info() + oErrMsgMissingInput = Windream_get_Doc_info() Else ' oErrorMessage = IDB_GetDocInfo() End If - If oErrorMessage = "" Then + If oErrMsgMissingInput = "" Then If WMDocPathWindows <> String.Empty Then load_viewer() LOGGER.Debug("Viewer loaded!") @@ -2472,7 +2575,7 @@ Public Class frmValidator End If activate_controls(True) Else - errormessage = oErrorMessage + errormessage = oErrMsgMissingInput frmError.ShowDialog() End If 'Else @@ -2480,8 +2583,8 @@ Public Class frmValidator ' frmError.ShowDialog() 'End If Else - If oErrorMessage <> "" Then - errormessage = oErrorMessage + If oErrMsgMissingInput <> "" Then + errormessage = oErrMsgMissingInput frmError.ShowDialog() Else Dim oMsg = "Ende des Profils - Keine weiteren Vorgänge!" @@ -3903,7 +4006,7 @@ Public Class frmValidator Else 'lblerror.Visible = True 'lblerror.Text = errmessage - errormessage = oErrorMessage + errormessage = oErrMsgMissingInput frmError.ShowDialog() oErrorOcurred = True ItemWorked = False @@ -4014,7 +4117,7 @@ Public Class frmValidator 'Jetzt die Datei indexieren If Indexiere_File(CURRENT_WMFILE, NameVKTIndex, oNewValue) = False Then oMissing = True - oErrorMessage = "Error while indexing Vektorfeld '" & NameVKTIndex & "' - ERROR: " & idxerr_message + oErrMsgMissingInput = "Error while indexing Vektorfeld '" & NameVKTIndex & "' - ERROR: " & idxerr_message End If End If @@ -4078,7 +4181,7 @@ Public Class frmValidator Dim lookup As LookupControl2 = oControl If lookup.SelectedValues.Count = 0 And oIsRequired = True Then oMissing = True - oErrorMessage = $"Kein Auswahl getroffen in LookupGrid '{oControl.Name}'" + oErrMsgMissingInput = $"Kein Auswahl getroffen in LookupGrid '{oControl.Name}'" oControl.BackColor = Color.Red Exit For Else @@ -4105,7 +4208,7 @@ Public Class frmValidator If Indexiere_File(CURRENT_WMFILE, oIndexName, myVektorArr) = False Then oMissing = True - oErrorMessage = "Error while indexing von LookupGrid - ERROR: " & idxerr_message + oErrMsgMissingInput = "Error while indexing von LookupGrid - ERROR: " & idxerr_message Exit For End If Else @@ -4113,7 +4216,7 @@ Public Class frmValidator If IDBData.SetVariableValue(oIndexName, oMyDT, oOVERWRITE_DATA, oIDBTyp) = False Then oMissing = True - oErrorMessage = "Error while indexing IDB-Object LookupGrid" + oErrMsgMissingInput = "Error while indexing IDB-Object LookupGrid" Exit For End If End If @@ -4122,7 +4225,7 @@ Public Class frmValidator If IDB_ACTIVE = False Then If Indexiere_File(CURRENT_WMFILE, oIndexName, oValues.ToArray) = False Then oMissing = True - oErrorMessage = "Error while indexing von LookupGrid - ERROR: " & idxerr_message + oErrMsgMissingInput = "Error while indexing von LookupGrid - ERROR: " & idxerr_message Exit For End If @@ -4135,7 +4238,7 @@ Public Class frmValidator oMyInput = lookup.SelectedValues.FirstOrDefault() If IsNothing(oMyInput) And oIsRequired = True Then oMissing = True - oErrorMessage = $"Could not get FirstOrDefault-Value of LookUpGrid! - LookUPGridName: {lookup.Name}" + oErrMsgMissingInput = $"Could not get FirstOrDefault-Value of LookUpGrid! - LookUPGridName: {lookup.Name}" Exit For ElseIf IsNothing(oMyInput) And oIsRequired = False Then Continue For @@ -4200,7 +4303,7 @@ Public Class frmValidator 'Hier muss nun separat as Vektorfeld indexiert werden If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then oMissing = True - oErrorMessage = "Error while indexing Textbox as VEKTOR - ERROR: " & idxerr_message + oErrMsgMissingInput = "Error while indexing Textbox as VEKTOR - ERROR: " & idxerr_message Exit For End If Else @@ -4210,7 +4313,7 @@ Public Class frmValidator result(0) = oMyInput If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then oMissing = True - oErrorMessage = "Error while indexing Textbox - ERROR: " & idxerr_message + oErrMsgMissingInput = "Error while indexing Textbox - ERROR: " & idxerr_message Exit For End If Else @@ -4246,11 +4349,11 @@ Public Class frmValidator If oRegexMatch <> String.Empty AndAlso Not Regex.IsMatch(oControl.Text, oRegexMatch) Then oMissing = True - oErrorMessage = oWrongInputMessage & " textbox '" & oControl.Name & "'" + oErrMsgMissingInput = oWrongInputMessage & " textbox '" & oControl.Name & "'" If oRegexMessage <> String.Empty Then - oErrorMessage &= ":" & vbCrLf & oRegexMessage + oErrMsgMissingInput &= ":" & vbCrLf & oRegexMessage End If oControl.BackColor = Color.Red @@ -4260,7 +4363,7 @@ Public Class frmValidator 'as erstes überprüfen ob überhaupt etwas eingetragen worden ist If Check_Missing(oControl, "txt") = True And oIsRequired = True Then 'NICHTS EINGETRAGEN oMissing = True - oErrorMessage = oWrongInputMessage & " textbox '" & oControl.Name & "'" + oErrMsgMissingInput = oWrongInputMessage & " textbox '" & oControl.Name & "'" oControl.BackColor = Color.Red Exit For @@ -4309,7 +4412,7 @@ Public Class frmValidator 'Hier muss nun separat as Vektorfeld indexiert werden If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then oMissing = True - oErrorMessage = "Error while indexing textbox as VEKTOR - ERROR: " & idxerr_message + oErrMsgMissingInput = "Error while indexing textbox as VEKTOR - ERROR: " & idxerr_message Exit For End If Else @@ -4319,7 +4422,7 @@ Public Class frmValidator result(0) = oMyInput If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then oMissing = True - oErrorMessage = "Error while indexing Textbox - ERROR: " & idxerr_message + oErrMsgMissingInput = "Error while indexing Textbox - ERROR: " & idxerr_message Exit For End If Else @@ -4345,7 +4448,7 @@ Public Class frmValidator End If End If Catch ex As Exception - oErrorMessage = "Unexpected error in Check_UpdateIndexe TextBox '" & oControl.Name & "' - Check the log" + oErrMsgMissingInput = "Unexpected error in Check_UpdateIndexe TextBox '" & oControl.Name & "' - Check the log" LOGGER.Error(ex) Dim st As New StackTrace(True) st = New StackTrace(ex, True) @@ -4360,7 +4463,7 @@ Public Class frmValidator 'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss If cmb.SelectedIndex = -1 And oIsRequired = True Then oMissing = True - oErrorMessage = "Please Choose an entry out of ComboBox '" & cmb.Name & "'" + oErrMsgMissingInput = "Please Choose an entry out of ComboBox '" & cmb.Name & "'" Exit For 'ElseIf cmb.SelectedIndex <> -1 Then Else 'Änderung 28.08.2018: Ein leerer Wert in der Combobox wird in den Index geschrieben @@ -4415,7 +4518,7 @@ Public Class frmValidator 'Hier muss nun separat as Vektorfeld indexiert werden If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then oMissing = True - oErrorMessage = "Error while indexing Combobox as VEKTOR - ERROR: " & idxerr_message + oErrMsgMissingInput = "Error while indexing Combobox as VEKTOR - ERROR: " & idxerr_message Exit For End If Else @@ -4426,14 +4529,14 @@ Public Class frmValidator If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then cmb.DroppedDown = True oMissing = True - oErrorMessage = "Error while indexing Combobox - ERROR: " & idxerr_message + oErrMsgMissingInput = "Error while indexing Combobox - ERROR: " & idxerr_message Exit For End If Else If IDBData.SetVariableValue(oIndexName, oMyInput) = False Then cmb.DroppedDown = True oMissing = True - oErrorMessage = "Error indexing combobox idb" + oErrMsgMissingInput = "Error indexing combobox idb" Exit For End If End If @@ -4472,7 +4575,7 @@ Public Class frmValidator 'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss If oIsRequired = True And dtp.Value.ToString = String.Empty Then oMissing = True - oErrorMessage = "Please Choose DateValue for field'" & dtp.Name & "'" + oErrMsgMissingInput = "Please Choose DateValue for field'" & dtp.Name & "'" Exit For ElseIf dtp.Value.ToString <> "01.01.0001 00:00:00" Then oMyInput = CDate(dtp.Value) @@ -4496,7 +4599,7 @@ Public Class frmValidator 'Hier muss nun separat as Vektorfeld indexiert werden If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then oMissing = True - oErrorMessage = "Error while indexing DatePicker as VEKTOR - ERROR: " & idxerr_message + oErrMsgMissingInput = "Error while indexing DatePicker as VEKTOR - ERROR: " & idxerr_message Exit For End If Else @@ -4506,13 +4609,13 @@ Public Class frmValidator result(0) = CDate(oMyInput) If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then oMissing = True - oErrorMessage = "Error while indexing DatePicker- ERROR: " & idxerr_message + oErrMsgMissingInput = "Error while indexing DatePicker- ERROR: " & idxerr_message Exit For End If Else If IDBData.SetVariableValue(oIndexName, oObjectValue) = False Then oMissing = True - oErrorMessage = "Error indexing datepicker idb" + oErrMsgMissingInput = "Error indexing datepicker idb" Exit For End If End If @@ -4593,19 +4696,19 @@ Public Class frmValidator 'Hier muss nun separat as Vektorfeld indexiert werden If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then oMissing = True - oErrorMessage = "Error while indexing Checkbox as VEKTOR - ERROR: " & idxerr_message + oErrMsgMissingInput = "Error while indexing Checkbox as VEKTOR - ERROR: " & idxerr_message Exit For End If Else If IDB_ACTIVE = False Then If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then oMissing = True - oErrorMessage = "Error while indexing Checkbox - ERROR: " & idxerr_message + oErrMsgMissingInput = "Error while indexing Checkbox - ERROR: " & idxerr_message Exit For End If Else If IDBData.SetVariableValue(oIndexName, chk.Checked.ToString) Then - oErrorMessage = "error indexing checkboxidb" + oErrMsgMissingInput = "error indexing checkboxidb" Exit For End If End If @@ -4637,7 +4740,7 @@ Public Class frmValidator 'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss If oIsRequired = True And Zeilen = 0 Then oMissing = True - oErrorMessage = "Fehlende Eingabe in Vektorfeld '" & dgv.Name & "'" + oErrMsgMissingInput = "Fehlende Eingabe in Vektorfeld '" & dgv.Name & "'" Exit For ElseIf Zeilen > 0 Then Dim ZeilenGrid As Integer = 0 @@ -4681,7 +4784,7 @@ Public Class frmValidator If IDB_ACTIVE = False Then If Indexiere_File(CURRENT_WMFILE, oIndexName, myVektorArr) = False Then oMissing = True - oErrorMessage = "Error while indexing Vektorfeld - ERROR: " & idxerr_message + oErrMsgMissingInput = "Error while indexing Vektorfeld - ERROR: " & idxerr_message Exit For End If Else @@ -4689,7 +4792,7 @@ Public Class frmValidator If oDT.Rows.Count > 0 Then If IDBData.SetVariableValue(oIndexName, oDT, True) = False Then oMissing = True - oErrorMessage = "Error indexing Datagridview idb" + oErrMsgMissingInput = "Error indexing Datagridview idb" Exit For End If End If @@ -4705,7 +4808,7 @@ Public Class frmValidator 'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss If oIsRequired = True And oRowCount = 0 Then oMissing = True - oErrorMessage = "Fehlende Eingabe in Tabelle '" & dgv.Name & "'" + oErrMsgMissingInput = "Fehlende Eingabe in Tabelle '" & dgv.Name & "'" oControl.BackColor = Color.Red Exit For @@ -4761,7 +4864,7 @@ Public Class frmValidator If IDB_ACTIVE = False Then If Indexiere_File(CURRENT_WMFILE, oIndexName, myVektorArr) = False Then oMissing = True - oErrorMessage = $"Error while indexing table (1) {dgv.Name} - ERROR: " & idxerr_message + oErrMsgMissingInput = $"Error while indexing table (1) {dgv.Name} - ERROR: " & idxerr_message Exit For End If Else @@ -4769,7 +4872,7 @@ Public Class frmValidator If oMyDT.Rows.Count > 0 Then If IDBData.SetVariableValue(oIndexName, oMyDT, True, oIDBTyp) = False Then oMissing = True - oErrorMessage = $"Error while indexing table IDB (1) {dgv.Name} - ERROR: " & idxerr_message + oErrMsgMissingInput = $"Error while indexing table IDB (1) {dgv.Name} - ERROR: " & idxerr_message Exit For End If End If @@ -4783,7 +4886,7 @@ Public Class frmValidator If Indexiere_File(CURRENT_WMFILE, oIndexName, oValue.ToArray) = False Then oMissing = True 'oErrorMessage = "Error while indexing der Tabelle - ERROR: " & idxerr_message - oErrorMessage = $"Error while indexing table (2) {dgv.Name} - ERROR: " & idxerr_message + oErrMsgMissingInput = $"Error while indexing table (2) {dgv.Name} - ERROR: " & idxerr_message Exit For End If Else @@ -5147,6 +5250,12 @@ Public Class frmValidator End Sub Private Sub BarButtonItem6_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniRefreshSearches.ItemClick + Try + _frmValidatorSearch.Close() + _frmValidatorSearch = New frmValidatorSearch + Catch ex As Exception + + End Try Load_Additional_Searches() End Sub @@ -5217,4 +5326,31 @@ Public Class frmValidator Return System.IO.Path.Combine(Application.UserAppDataPath(), Filename) End Function + Private Sub bbtnitem_ConversationNew_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitem_ConversationNew.ItemClick + Dim oDTUSER As DataTable + For Each oRow As DataRow In DTDYNAMIC_RIGHTS.Rows + + If oRow.Item("CONF_TITLE") = "NEW_CONVERSATION_USER_SELECT" Then + Dim oSQL = oRow.Item("CONF_VALUE") + oDTUSER = ClassDatabase.Return_Datatable(oSQL) + + End If + Next + If Not IsNothing(oDTUSER) Then + CURRENT_CONVERSATION_NEW = 0 + Dim oForm As New frmChat_NewConversation(oDTUSER, Nothing) + 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 + End If + + End If + + + End Sub + End Class \ No newline at end of file diff --git a/app/SetupVS19/Product.wxs b/app/SetupVS19/Product.wxs index e13ea3c..ff8b14b 100644 --- a/app/SetupVS19/Product.wxs +++ b/app/SetupVS19/Product.wxs @@ -121,6 +121,8 @@ + +