merge vers

VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb

@@ -41,6 +41,7 @@ Partial Class frmMessenger
         Me.SplitContainer2 = New System.Windows.Forms.SplitContainer()
         Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Panel6 = New System.Windows.Forms.Panel()
+        Me.Label3 = New System.Windows.Forms.Label()
         Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label()
         Me.cbxInaktiveChats = New System.Windows.Forms.CheckBox()
         Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
@@ -100,6 +101,7 @@ Partial Class frmMessenger
         Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn()
         CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainer.Panel1.SuspendLayout()
         Me.SplitContainer.Panel2.SuspendLayout()
@@ -175,7 +177,7 @@ Partial Class frmMessenger
         Me.SplitContainer2.Panel2.Controls.Add(Me.DGVSonstige)
         Me.SplitContainer2.Panel2.Controls.Add(Me.Panel5)
         Me.SplitContainer2.Panel2Collapsed = True
-        Me.SplitContainer2.Size = New System.Drawing.Size(275, 794)
+        Me.SplitContainer2.Size = New System.Drawing.Size(275, 787)
         Me.SplitContainer2.SplitterDistance = 590
         Me.SplitContainer2.SplitterWidth = 3
         Me.SplitContainer2.TabIndex = 8
@@ -224,19 +226,29 @@ Partial Class frmMessenger
         Me.dgvChats.RowsDefaultCellStyle = DataGridViewCellStyle4
         Me.dgvChats.RowTemplate.Height = 30
         Me.dgvChats.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvChats.Size = New System.Drawing.Size(275, 773)
+        Me.dgvChats.Size = New System.Drawing.Size(275, 739)
         Me.dgvChats.TabIndex = 0
         '
         'Panel6
         '
+        Me.Panel6.Controls.Add(Me.Label3)
         Me.Panel6.Controls.Add(Me.lblLKWChat_MsgCntInaktiv)
         Me.Panel6.Controls.Add(Me.cbxInaktiveChats)
         Me.Panel6.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.Panel6.Location = New System.Drawing.Point(0, 773)
+        Me.Panel6.Location = New System.Drawing.Point(0, 739)
         Me.Panel6.Name = "Panel6"
-        Me.Panel6.Size = New System.Drawing.Size(275, 21)
+        Me.Panel6.Size = New System.Drawing.Size(275, 48)
         Me.Panel6.TabIndex = 7
         '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(5, 23)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(237, 13)
+        Me.Label3.TabIndex = 108
+        Me.Label3.Text = "Chats werden nach 30 Tagen auf inaktiv gesetzt"
+        '
         'lblLKWChat_MsgCntInaktiv
         '
         Me.lblLKWChat_MsgCntInaktiv.BackColor = System.Drawing.Color.Red
@@ -409,9 +421,9 @@ Partial Class frmMessenger
         '
         Me.Panel2.Controls.Add(Me.cbxInaktiveChatsSpecial)
         Me.Panel2.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.Panel2.Location = New System.Drawing.Point(0, 899)
+        Me.Panel2.Location = New System.Drawing.Point(0, 892)
         Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(275, 23)
+        Me.Panel2.Size = New System.Drawing.Size(275, 30)
         Me.Panel2.TabIndex = 6
         '
         'cbxInaktiveChatsSpecial
@@ -987,6 +999,13 @@ Partial Class frmMessenger
         Me.DataGridViewTextBoxColumn3.ReadOnly = True
         Me.DataGridViewTextBoxColumn3.Width = 150
         '
+        'DataGridViewTextBoxColumn4
+        '
+        Me.DataGridViewTextBoxColumn4.HeaderText = ""
+        Me.DataGridViewTextBoxColumn4.Name = "DataGridViewTextBoxColumn4"
+        Me.DataGridViewTextBoxColumn4.ReadOnly = True
+        Me.DataGridViewTextBoxColumn4.Width = 20
+        '
         'frmMessenger
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1105,4 +1124,6 @@ Partial Class frmMessenger
     Friend WithEvents clmnName As DataGridViewTextBoxColumn
     Friend WithEvents clmnFirma As DataGridViewTextBoxColumn
     Friend WithEvents clmnStatus As DataGridViewTextBoxColumn
+    Friend WithEvents DataGridViewTextBoxColumn4 As DataGridViewTextBoxColumn
+    Friend WithEvents Label3 As Label
 End Class

VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb

@@ -822,7 +822,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
             Dim Dt_New As DataTable = SQL.loadDgvBySql("SELECT [chat_id],CASE WHEN chat_name<>'' THEN chat_name ELSE (SELECT TOP 1 mit_vname + ' ' + mit_nname FROM tblMessenger_ChatMembers INNER JOIN tblMitarbeiter ON mit_id=chatMb_maId where chatMb_chatId=chat_id AND chatMb_maId <>" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & ") END as chat_name 
                                           ,(SELECT REPLACE(COUNT(*),'0','') FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE [chat_id]=chatMg_chatId AND chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0)  as ungelesen  
                                             FROM [tblMessenger_Chat] WHERE (SELECT COUNT(*) FROM tblMessenger_ChatMembers WHERE chatMB_chatId=chat_id AND chatMB_maId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & ")>0
-                                            AND chat_aktiv='" & (Not cbxInaktiveChats.Checked) & "' ORDER BY chat_lastMsg DESC", "ADMIN")
+                                            AND chat_aktiv=" & IIf(Not cbxInaktiveChats.Checked, 1, 0) & " ORDER BY chat_lastMsg DESC", "ADMIN")
             Dim Dt_Current As DataTable = dgvChats.DataSource
 
             If Dt_New Is Nothing Then Return True