edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Messenger Bugfix, Mahnungen für Verag360, etc.

Browse Source
This commit is contained in:
d.breimaier
2024-08-14 16:24:46 +02:00
parent a5366e75a1
commit 311cb70fca
11 changed files with 315 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb
View File

@@ -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

4
VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb
View File

@@ -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")