Messenger Bugfix, Mahnungen für Verag360, etc.

2024-08-14 16:24:46 +02:00
parent a5366e75a1
commit 311cb70fca
11 changed files with 315 additions and 231 deletions
--- a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb
@@ -43,11 +43,11 @@ Public Class cMessenger

    Public Shared Function GET_NewMSG_COUNT(Optional maId = -1) As Integer
        If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
-        Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0 ", "ADMIN",,, 0)
+        Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0 and chatMg_chatId in (SELECT [chatMb_chatId] FROM [tblMessenger_ChatMembers] where [chatMb_maId] = " & maId & ")", "ADMIN",,, 0)
    End Function
    Public Shared Function GET_NewMSG_COUNT_CHATID(maId, chat_Id) As Integer
        If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
-        Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND chatMgSt_gelesen=0  AND chatMg_chatId='" & chat_Id & "'", "ADMIN",,, 0)
+        Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND chatMgSt_gelesen=0  AND chatMg_chatId='" & chat_Id & "' AND (SELECT COUNT(*) FROM tblMessenger_ChatMembers WHERE chatMB_chatId='" & chat_Id & "'AND chatMB_maId=" & maId & ")>0", "ADMIN",,, 0)
    End Function

    Public Shared Function SET_LKWCHAT_INAKTIV(AvisoId) As Integer
@@ -56,7 +56,8 @@ Public Class cMessenger

    Public Shared Function GET_NewMSG_COUNT_ART(maId, chat_art) As Integer
        If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
-        Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_Chat on chat_id=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & "  AND chatMgSt_gelesen=0  AND chat_art='" & chat_art & "' AND (SELECT COUNT(*) FROM tblMessenger_ChatMembers WHERE chatMB_chatId=chat_id AND chatMB_maId=" & maId & ")>0", "ADMIN",,, 0)
+        'Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_Chat on chat_id=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & "  AND chatMgSt_gelesen=0  AND chat_art='" & chat_art & "' AND (SELECT COUNT(*) FROM tblMessenger_ChatMembers WHERE chatMB_chatId=chat_id AND chatMB_maId=" & maId & ")>0", "ADMIN",,, 0)
+        Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_Chat on chat_id=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & "  AND chatMgSt_gelesen=0  AND chat_art='" & chat_art & "' AND chatMg_chatId in (SELECT [chatMb_chatId] FROM [tblMessenger_ChatMembers] where [chatMb_maId] = " & maId & " and chatMB_chatId=chat_id)", "ADMIN",,, 0)
    End Function
    Public Shared Function GET_NewMSG_COUNT_ART_INAKTIV(maId, chat_art) As Integer
        If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
--- a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb
@@ -65,6 +65,8 @@ Public Class cMitarbeiter
    Property mit_FirmaHaupt As Object = Nothing
    Property mit_ChatEasteregg As Boolean = False

+    Property mit_ChatEasteregg2 As Boolean = False
+


    Property mit_MAVerzeichnis_SettingsTstmp As Object = Nothing
@@ -181,6 +183,7 @@ Public Class cMitarbeiter
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_ChatBenutzer", mit_ChatBenutzer))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_FirmaHaupt", mit_FirmaHaupt))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_ChatEasteregg", mit_ChatEasteregg))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_ChatEasteregg2", mit_ChatEasteregg2))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_MAVerzeichnis_SettingsTstmp", mit_MAVerzeichnis_SettingsTstmp))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_MAVerzeichnis_allowGebDat", mit_MAVerzeichnis_allowGebDat))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_MAVerzeichnis_allowWohnadresse", mit_MAVerzeichnis_allowWohnadresse))
@@ -377,6 +380,7 @@ Public Class cMitarbeiter

                            Me.mit_ChatBenutzer = dr.Item("mit_ChatBenutzer")
                            Me.mit_ChatEasteregg = dr.Item("mit_ChatEasteregg")
+                            Me.mit_ChatEasteregg2 = dr.Item("mit_ChatEasteregg2")

                            If Not dr.Item("mit_FirmaHaupt") Is DBNull.Value Then Me.mit_FirmaHaupt = dr.Item("mit_FirmaHaupt")

--- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb
@@ -24,6 +24,7 @@ Partial Class frmMessenger
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
@@ -38,12 +39,12 @@ Partial Class frmMessenger
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger))
        Me.SplitContainer = New System.Windows.Forms.SplitContainer()
        Me.SplitContainer2 = New System.Windows.Forms.SplitContainer()
-        Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+        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.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Panel5 = New System.Windows.Forms.Panel()
        Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.PictureBox2 = New System.Windows.Forms.PictureBox()
@@ -64,7 +65,7 @@ Partial Class frmMessenger
        Me.btnNeu = New System.Windows.Forms.Button()
        Me.Button1 = New System.Windows.Forms.Button()
        Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
-        Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel()
+        Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components)
        Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement()
        Me.Panel3 = New System.Windows.Forms.Panel()
        Me.btnTeilnehmer = New System.Windows.Forms.Button()
@@ -92,9 +93,9 @@ Partial Class frmMessenger
        Me.btnSendAtt = New System.Windows.Forms.Button()
        Me.btnSenden = New System.Windows.Forms.Button()
        Me.rtbChatMessage = New System.Windows.Forms.RichTextBox()
-        Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer()
-        Me.Timer_REFRESH = New System.Windows.Forms.Timer()
-        Me.cntxt = New System.Windows.Forms.ContextMenuStrip()
+        Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer(Me.components)
+        Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components)
+        Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ChatDeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.toolChatReminder = New System.Windows.Forms.ToolStripMenuItem()
        Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
--- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb
+++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb
@@ -5,7 +5,6 @@ Imports System.Security.Policy
 Imports System.Threading
 Imports System.Web.UI.WebControls.WebParts
 Imports System.Windows.Forms
-Imports Util
 Imports VERAG_PROG_ALLGEMEIN.cMessenger

 Public Class frmMessenger
@@ -21,6 +20,7 @@ Public Class frmMessenger
    Public SendungID As Integer = -1

    Dim alloweasteregg = False
+    Dim hiddemEmojis = False

    Dim toggle_CHAT_ART = "CHAT"
    Public Sub New()
@@ -123,6 +123,7 @@ Public Class frmMessenger
        MyFlowLayoutPanel1.Controls.Clear()
        'loaded = True
        alloweasteregg = cAllgemein.MITARBEITER.mit_ChatEasteregg
+        hiddemEmojis = cAllgemein.MITARBEITER.mit_ChatEasteregg2
        initEmojis()
        VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me)
    End Sub
@@ -131,8 +132,6 @@ Public Class frmMessenger
        FlowLayoutPanel.Controls.Clear()
        If alloweasteregg Then pic.Visible = False

-
-
        ' If IO.Directory.Exists(My.Application.roo "") Then

        Dim spezialEmoji = False
@@ -140,24 +139,27 @@ Public Class frmMessenger

        If IO.Directory.Exists(EMOJI_PATH) Then
            For Each aa In IO.Directory.GetFiles(EMOJI_PATH) '.OrderBy(Function(f) f)
-                If alloweasteregg Or Not aa.Contains("easteregg") Then
+                If (alloweasteregg Or Not aa.Contains("easteregg")) Then
                    If IO.File.Exists(aa) And aa.Contains(".png") And (aa.Contains("emoji_") Or spezialEmoji) Then
+                        If hiddemEmojis Or Not aa.Contains("_hidden") Then
+                            Dim p As New PictureBox
+                            p.Size = New Size(40, 40)
+                            p.BackgroundImage = Image.FromFile(aa)
+                            p.BackgroundImageLayout = ImageLayout.Zoom
+                            p.Cursor = Cursors.Hand
+                            AddHandler p.Click, Sub()
+                                                    If Not CHAT.chat_aktiv Then MsgBox("Chat inaktiv!") : Exit Sub
+                                                    If CHAT IsNot Nothing Then
+                                                        saveEmoji(aa)
+                                                    End If
+                                                End Sub

-                        Dim p As New PictureBox
-                        p.Size = New Size(40, 40)
-                        p.BackgroundImage = Image.FromFile(aa)
-                        p.BackgroundImageLayout = ImageLayout.Zoom
-                        p.Cursor = Cursors.Hand
-                        AddHandler p.Click, Sub()
-                                                If Not CHAT.chat_aktiv Then MsgBox("Chat inaktiv!") : Exit Sub
-                                                If CHAT IsNot Nothing Then
-                                                    saveEmoji(aa)
-                                                End If
-                                            End Sub
+                            FlowLayoutPanel.Controls.Add(p)
+                        End If

-                        FlowLayoutPanel.Controls.Add(p)
                    End If
                End If
+
                'MsgBox(a)
            Next
        End If