neu

2020-03-26 22:23:21 +01:00
parent ffde29023a
commit 4a358d43fd
5 changed files with 85 additions and 42 deletions
--- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb
@@ -89,7 +89,7 @@ Partial Class frmMessenger
        'SplitContainer.Panel2
        '
        Me.SplitContainer.Panel2.Controls.Add(Me.SplitContainer1)
-        Me.SplitContainer.Size = New System.Drawing.Size(817, 654)
+        Me.SplitContainer.Size = New System.Drawing.Size(817, 685)
        Me.SplitContainer.SplitterDistance = 272
        Me.SplitContainer.TabIndex = 0
        '
@@ -136,7 +136,7 @@ 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(272, 582)
+        Me.dgvChats.Size = New System.Drawing.Size(272, 613)
        Me.dgvChats.TabIndex = 0
        '
        'btnTEST
@@ -156,7 +156,7 @@ Partial Class frmMessenger
        '
        Me.Panel2.Controls.Add(Me.cbxInaktiveChats)
        Me.Panel2.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.Panel2.Location = New System.Drawing.Point(0, 624)
+        Me.Panel2.Location = New System.Drawing.Point(0, 655)
        Me.Panel2.Name = "Panel2"
        Me.Panel2.Size = New System.Drawing.Size(272, 30)
        Me.Panel2.TabIndex = 6
@@ -231,8 +231,8 @@ Partial Class frmMessenger
        'SplitContainer1.Panel2
        '
        Me.SplitContainer1.Panel2.Controls.Add(Me.pnl)
-        Me.SplitContainer1.Size = New System.Drawing.Size(541, 654)
-        Me.SplitContainer1.SplitterDistance = 439
+        Me.SplitContainer1.Size = New System.Drawing.Size(541, 685)
+        Me.SplitContainer1.SplitterDistance = 438
        Me.SplitContainer1.TabIndex = 0
        '
        'MyFlowLayoutPanel1
@@ -246,7 +246,7 @@ Partial Class frmMessenger
        Me.MyFlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill
        Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 0)
        Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1"
-        Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(541, 439)
+        Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(541, 438)
        Me.MyFlowLayoutPanel1.TabIndex = 0
        '
        'UsrCntlMessenger_ChatElement1
@@ -299,13 +299,14 @@ Partial Class frmMessenger
        Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill
        Me.pnl.Location = New System.Drawing.Point(0, 0)
        Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(541, 211)
+        Me.pnl.Size = New System.Drawing.Size(541, 243)
        Me.pnl.TabIndex = 0
        '
        'pic
        '
+        Me.pic.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.pic.Location = New System.Drawing.Point(489, 142)
+        Me.pic.Location = New System.Drawing.Point(489, 174)
        Me.pic.Name = "pic"
        Me.pic.Size = New System.Drawing.Size(49, 26)
        Me.pic.TabIndex = 7
@@ -314,20 +315,24 @@ Partial Class frmMessenger
        '
        'FlowLayoutPanel
        '
+        Me.FlowLayoutPanel.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.FlowLayoutPanel.AutoScroll = True
        Me.FlowLayoutPanel.Location = New System.Drawing.Point(4, 121)
        Me.FlowLayoutPanel.Name = "FlowLayoutPanel"
-        Me.FlowLayoutPanel.Size = New System.Drawing.Size(451, 87)
+        Me.FlowLayoutPanel.Size = New System.Drawing.Size(451, 119)
        Me.FlowLayoutPanel.TabIndex = 6
        '
        'Button4
        '
+        Me.Button4.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.Button4.BackColor = System.Drawing.Color.MediumSeaGreen
        Me.Button4.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.people
        Me.Button4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button4.ForeColor = System.Drawing.Color.White
-        Me.Button4.Location = New System.Drawing.Point(489, 171)
+        Me.Button4.Location = New System.Drawing.Point(489, 203)
        Me.Button4.Name = "Button4"
        Me.Button4.Size = New System.Drawing.Size(49, 33)
        Me.Button4.TabIndex = 5
@@ -359,6 +364,8 @@ Partial Class frmMessenger
        '
        'rtbChatMessage
        '
+        Me.rtbChatMessage.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.rtbChatMessage.Font = New System.Drawing.Font("Comic Sans MS", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.rtbChatMessage.Location = New System.Drawing.Point(3, 3)
        Me.rtbChatMessage.Name = "rtbChatMessage"
@@ -390,7 +397,7 @@ Partial Class frmMessenger
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(817, 654)
+        Me.ClientSize = New System.Drawing.Size(817, 685)
        Me.Controls.Add(Me.SplitContainer)
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
        Me.Name = "frmMessenger"
--- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb
+++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb
@@ -83,7 +83,7 @@ Public Class frmMessenger
            .DataSource = 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_id", "ADMIN")
+                                            AND chat_aktiv='" & (Not cbxInaktiveChats.Checked) & "' ORDER BY chat_id DESC", "ADMIN")

            If .Columns.Count = 0 Then Exit Sub

@@ -593,7 +593,7 @@ Public Class frmMessenger
    Private Sub dgvChats_CellMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles dgvChats.CellMouseClick
        If e.Button = MouseButtons.Right Then

-            If e.RowIndex > 0 Then
+            If e.RowIndex >= 0 Then
                If dgvChats.Rows.Count > 0 Then

                    'Dim chatId = dgvChats.Rows(e.RowIndex).Cells("chat_id").Value
@@ -644,7 +644,8 @@ Public Class frmMessenger
    End Sub

    Private Sub pic_Click(sender As Object, e As EventArgs) Handles pic.Click
-        If InputBox("Whoami?", "¿").ToLower = "easteregg" Then
+        Dim codewort = InputBox("Whoami?", "¿").ToLower
+        If codewort = "easteregg" Or codewort = "osterhase" Then
            cMitarbeiter.UPDATE_EASTEREGG(True)
            cAllgemein.MITARBEITER.LOAD(cAllgemein.USRID)

--- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger_NeuerChat.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger_NeuerChat.Designer.vb
@@ -25,9 +25,6 @@ Partial Class frmMessenger_NeuerChat
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger_NeuerChat))
        Me.dgvMitarbeiter = New System.Windows.Forms.DataGridView()
        Me.dgvChatMembers = New System.Windows.Forms.DataGridView()
-        Me.clmnMaId = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.clmnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.clmnFirma = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.btn = New System.Windows.Forms.Button()
        Me.lbl = New System.Windows.Forms.Label()
        Me.Label1 = New System.Windows.Forms.Label()
@@ -37,6 +34,9 @@ Partial Class frmMessenger_NeuerChat
        Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.clmnMaId = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnFirma = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        CType(Me.dgvMitarbeiter, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.dgvChatMembers, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -66,28 +66,12 @@ Partial Class frmMessenger_NeuerChat
        Me.dgvChatMembers.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnMaId, Me.clmnName, Me.clmnFirma})
        Me.dgvChatMembers.Location = New System.Drawing.Point(323, 62)
        Me.dgvChatMembers.Name = "dgvChatMembers"
+        Me.dgvChatMembers.ReadOnly = True
        Me.dgvChatMembers.RowHeadersVisible = False
        Me.dgvChatMembers.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
        Me.dgvChatMembers.Size = New System.Drawing.Size(327, 323)
        Me.dgvChatMembers.TabIndex = 2
        '
-        'clmnMaId
-        '
-        Me.clmnMaId.HeaderText = "Column1"
-        Me.clmnMaId.Name = "clmnMaId"
-        Me.clmnMaId.Visible = False
-        '
-        'clmnName
-        '
-        Me.clmnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        Me.clmnName.HeaderText = "Name"
-        Me.clmnName.Name = "clmnName"
-        '
-        'clmnFirma
-        '
-        Me.clmnFirma.HeaderText = "Firma"
-        Me.clmnFirma.Name = "clmnFirma"
-        '
        'btn
        '
        Me.btn.BackColor = System.Drawing.Color.SteelBlue
@@ -177,6 +161,26 @@ Partial Class frmMessenger_NeuerChat
        Me.MyTextBox2.Size = New System.Drawing.Size(327, 20)
        Me.MyTextBox2.TabIndex = 6
        '
+        'clmnMaId
+        '
+        Me.clmnMaId.HeaderText = "Column1"
+        Me.clmnMaId.Name = "clmnMaId"
+        Me.clmnMaId.ReadOnly = True
+        Me.clmnMaId.Visible = False
+        '
+        'clmnName
+        '
+        Me.clmnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.clmnName.HeaderText = "Name"
+        Me.clmnName.Name = "clmnName"
+        Me.clmnName.ReadOnly = True
+        '
+        'clmnFirma
+        '
+        Me.clmnFirma.HeaderText = "Firma"
+        Me.clmnFirma.Name = "clmnFirma"
+        Me.clmnFirma.ReadOnly = True
+        '
        'MyTextBox1
        '
        Me.MyTextBox1._DateTimeOnly = False
--- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger_NeuerChat.vb
+++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger_NeuerChat.vb
@@ -73,18 +73,23 @@ Public Class frmMessenger_NeuerChat
    Sub addSelMA()
        If dgvMitarbeiter.SelectedRows.Count > 0 Then
            dgvChatMembers.Rows.Add(dgvMitarbeiter.SelectedRows(0).Cells("mit_id").Value, dgvMitarbeiter.SelectedRows(0).Cells("MAname").Value, dgvMitarbeiter.SelectedRows(0).Cells("mit_firma").Value)
-            If dgvChatMembers.Rows.Count = 1 Then
-                MyTextBox2.Text = dgvMitarbeiter.SelectedRows(0).Cells("MAname").Value
-                MyTextBox2.Enabled = False
-            Else
-                MyTextBox2.Text = ""
-                MyTextBox2.Enabled = True
-            End If
+            initAddRemoveDGV()
            MyTextBox1.Text = ""
            MyTextBox1.Focus()
        End If
    End Sub

+    Sub initAddRemoveDGV()
+        If dgvChatMembers.Rows.Count = 1 Then
+            MyTextBox2.Text = dgvChatMembers.Rows(0).Cells("clmnName").Value 'dgvMitarbeiter.SelectedRows(0).Cells("MAname").Value
+            MyTextBox2.Enabled = False
+        Else
+            MyTextBox2.Text = ""
+            MyTextBox2.Enabled = True
+        End If
+    End Sub
+
+
    Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click

        If MyTextBox2.Enabled And MyTextBox2.Text = "" Then
@@ -99,10 +104,20 @@ Public Class frmMessenger_NeuerChat
        Dim chatName = If(MyTextBox2.Enabled, MyTextBox2.Text, "")

        Dim MB_LIST As New List(Of Integer)
-        MB_LIST.Add(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID) 'Selbst!
        For Each r As DataGridViewRow In dgvChatMembers.Rows
            MB_LIST.Add(r.Cells("clmnMaId").Value)
        Next
+        If chatName = "" And MB_LIST.Count = 1 Then
+            If VERAG_PROG_ALLGEMEIN.cMessenger.CHECK_EXISTS(MB_LIST(0), chat_id) Then
+                If vbYes <> MsgBox("Ein Chat mit diesem Mitarbetier existiert bereits. Möchten Sie wirklich einen neuen öffnen?", vbYesNoCancel) Then
+                    Me.DialogResult = DialogResult.OK
+                    Me.Close()
+                    Exit Sub
+                End If
+            End If
+        End If
+        MB_LIST.Add(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID) 'Selbst!
+
        Dim CHAT As cMessenger.cMessenger_Chat = Nothing
        If VERAG_PROG_ALLGEMEIN.cMessenger.GEN_NEW_CHAT(chatName, MB_LIST, CHAT) Then
            If CHAT IsNot Nothing Then chat_id = CHAT.chat_id
@@ -118,4 +133,9 @@ Public Class frmMessenger_NeuerChat
    Private Sub dgvMitarbeiter_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvMitarbeiter.CellDoubleClick
        addSelMA()
    End Sub
+
+
+    Private Sub dgvChatMembers_RowsRemoved(sender As Object, e As DataGridViewRowsRemovedEventArgs) Handles dgvChatMembers.RowsRemoved
+        initAddRemoveDGV()
+    End Sub
 End Class