MDM-Word Logo, divers

2023-03-06 21:30:46 +01:00
parent ff705db787
commit 397738ca5f
40 changed files with 167 additions and 80 deletions
--- a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte
+++ b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte
@@ -22,6 +22,7 @@ Public Class KdSearchBox
    Public Property _display_Name1 As Boolean = False ' nur wenn _loadKdData

    Public Property _ValueKdAndName As Boolean = True
+    Public Property _searchName1 As Boolean = True
    Public Property _loadKdData As Boolean = False

    Public Property _hideIfListEmpty As Boolean = True
@@ -341,7 +342,9 @@ Public Class KdSearchBox
                SQLstr &= "  INNER JOIN Filialen on Filialen.FilialenNr=isnull(Kunden.FilialenNr,4803) "
                SQLstr &= "  WHERE 1=1 "
                SQLstr &= " AND (  "
-                SQLstr &= "   Ordnungsbegriff LIKE '" & srch & "%'   " : If IsNumeric(srch) Then SQLstr &= "  OR AdressenNr LIKE '" & srch & "%'   "
+                SQLstr &= "   Ordnungsbegriff LIKE '" & srch & "%'   "
+                If IsNumeric(srch) Then SQLstr &= "  OR AdressenNr LIKE '" & srch & "%'   "
+                If _searchName1 Then SQLstr &= "  OR Adressen.[Name 1] LIKE '" & srch & "%'   "
                SQLstr &= "   ) "
                If srch2 <> "" Then SQLstr &= " AND (Filialen.Firma LIKE '" & srch2 & "%' OR ( Adressen.PLZ LIKE '" & srch2 & "%' OR Adressen.Ort LIKE '" & srch2 & "%' OR Adressen.LandKz LIKE '" & srch2 & "%' OR Adressen.Straße LIKE '" & srch2 & "%' )) "
                SQLstr &= "  AND [Auswahl]='A' "
@@ -423,7 +426,9 @@ Public Class KdSearchBox
                SQLstr &= "  INNER JOIN Filialen on Filialen.FilialenNr=isnull(Kunden.FilialenNr,4803) "
                SQLstr &= "  WHERE 1=1 "
                SQLstr &= " AND (  "
-                SQLstr &= "   Ordnungsbegriff LIKE '" & srch & "%'   " : If IsNumeric(srch) Then SQLstr &= "  OR AdressenNr LIKE '" & srch & "%'   "
+                SQLstr &= "   Ordnungsbegriff LIKE '" & srch & "%'   "
+                If IsNumeric(srch) Then SQLstr &= "  OR AdressenNr LIKE '" & srch & "%'   "
+                If _searchName1 Then SQLstr &= "  OR Adressen.[Name 1] LIKE '" & srch & "%'   "
                SQLstr &= "   ) "
                If srch2 <> "" Then SQLstr &= " AND (Filialen.Firma LIKE '" & srch2 & "%' OR ( Adressen.PLZ LIKE '" & srch2 & "%' OR Adressen.Ort LIKE '" & srch2 & "%' OR Adressen.LandKz LIKE '" & srch2 & "%' OR Adressen.Straße LIKE '" & srch2 & "%' )) "
                SQLstr &= "  AND [Auswahl]='I' "
--- a/VERAG_PROG_ALLGEMEIN/Classes/cAvisoBenachrichtigungen.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cAvisoBenachrichtigungen.vb
@@ -246,5 +246,7 @@ Public Class cAvisoBenachrichtigungenCodes
    Public Shared Vorauskasse_OK As Integer = 6
    Public Shared ZOLL_Dokumentenbeschau As Integer = 7
    Public Shared ZOLL_Rueckweisung As Integer = 8
+    Public Shared ZOLL_Mitteilung As Integer = 9
+

 End Class
--- a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb
@@ -64,22 +64,41 @@ Public Class cMessenger
    End Function

    Public Shared Function GET_NewMSG_COUNT_AVISOID(AvisoId As Integer) As Integer
-        Dim chat_id = SQL.DLookup("chat_id", "tblMessenger_ChatMembers inner join tblMessenger_Chat on chat_id=chatMb_chatId", "chat_AvisoId='" & AvisoId & "' and [chatMb_maId]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "'", "ADMIN", -1)
+        'Dim chat_id = SQL.DLookup("chat_id", "tblMessenger_ChatMembers inner join tblMessenger_Chat on chat_id=chatMb_chatId", "chat_AvisoId='" & AvisoId & "' and [chatMb_maId]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "'", "ADMIN", -1)
+        Dim chat_id = SQL.DLookup("chat_id", "tblMessenger_Chat ", "chat_AvisoId='" & AvisoId & "'  AND (chat_SendungsId is null or chat_SendungsId<=0)", "ADMIN", -1)
        If chat_id > 0 Then 'Ich bin Member vom Chat.
-            Return GET_NewMSG_COUNT_CHATID(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID, chat_id)
-        Else
+            '  Return GET_NewMSG_COUNT_CHATID(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID, chat_id)
+            ' Else
            ' MsgBox(SQL.DLookup("isnull(count(*),0)", "tblMessenger_ChatMessages inner join tblMessenger_Chat on chat_id=chatMg_chatId", "chat_AvisoId='" & AvisoId & "'", "ADMIN", 0))
-            Return SQL.DLookup("isnull(count(*),0)", "tblMessenger_ChatMessages inner join tblMessenger_Chat on chat_id=chatMg_chatId", "chat_AvisoId='" & AvisoId & "'", "ADMIN", 0)
+            Return SQL.DLookup("isnull(count(*),0)", "tblMessenger_ChatMessages inner join tblMessenger_Chat on chat_id=chatMg_chatId", "chat_AvisoId='" & AvisoId & "'  AND (chat_SendungsId is null or chat_SendungsId<=0) ", "ADMIN", 0)
        End If
    End Function
    Public Shared Function GET_NewMSG_COUNT_SendungsID(SendungsID As Integer) As Integer
-        Dim chat_id = SQL.DLookup("chat_id", "tblMessenger_ChatMembers inner join tblMessenger_Chat on chat_id=chatMb_chatId", "chat_SendungsId='" & SendungsID & "' and [chatMb_maId]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "'", "ADMIN", -1)
+        Dim chat_id = SQL.DLookup("chat_id", "tblMessenger_Chat ", "chat_SendungsId='" & SendungsID & "'", "ADMIN", -1)
        If chat_id > 0 Then 'Ich bin Member vom Chat.
-            Return GET_NewMSG_COUNT_CHATID(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID, chat_id)
-        Else
+            ' Return GET_NewMSG_COUNT_CHATID(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID, chat_id)
+            '   Else
            Return SQL.DLookup("isnull(count(*),0)", "tblMessenger_ChatMessages inner join tblMessenger_Chat on chat_id=chatMg_chatId", "chat_SendungsId='" & SendungsID & "'", "ADMIN", 0)
        End If
    End Function
+    Public Shared Function isACTIVE_AVISOID(AvisoId As Integer) As Boolean
+        Dim chat_idCNT = SQL.DLookup("COUNT(*)", "tblMessenger_Chat", "chat_AvisoId='" & AvisoId & "' AND (SendungsID is null or SendungsID<=0)", "ADMIN", -1)
+        If chat_idCNT > 0 Then 'Ich bin Member vom Chat.
+            Return True
+        Else
+            Return False
+        End If
+    End Function
+    Public Shared Function isACTIVE_SendungsID(SendungsID As Integer) As Boolean
+        Dim chat_idCNT = SQL.DLookup("COUNT(*)", "tblMessenger_Chat", "chat_SendungsId='" & SendungsID & "'", "ADMIN", -1)
+        If chat_idCNT > 0 Then 'Ich bin Member vom Chat.
+            Return True
+        Else
+            Return False
+        End If
+    End Function
+
+

    Public Shared Function GET_CHAT_LIST() As List(Of cMessenger_Chat)
        Dim LIST As New List(Of cMessenger_Chat)
--- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb
+++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb
@@ -350,6 +350,18 @@ Public Class cProgramFunctions
        End Try


+        'Prüfen, ob Empfänger angegeben:
+        If Msg.To.Count = 0 And Msg.CC.Count = 0 And Msg.Bcc.Count = 0 Then
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Kein Empfänger!", "TO:  " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
+            Return False
+        End If
+
+        'Msg.To.Clear()
+        'Msg.CC.Clear()
+        'Msg.Bcc.Clear()
+        'Msg.To.Add("al@verag.ag")
+
+

        Try
            'SENDEN::::::::::::::::::::::
@@ -358,7 +370,7 @@ Public Class cProgramFunctions
        Catch ex As Exception
            Try 'Falls Fehler nicht beim Senden, sonder was anderes.

-                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "TO: " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "TO:  " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
            Catch ex3 As Exception
            End Try