Mahnlauf fix, Mitarbeiter, verwahrung, etc.

UID/Mitarbeiter/frmMitarbDetails.vb

@@ -1,5 +1,6 @@
 
 Imports System.Text.RegularExpressions
+Imports Confluent.Kafka
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class frmMitarbDetails
@@ -1873,22 +1874,22 @@ Public Class frmMitarbDetails
 
     End Sub
 
-    Private Sub cbxeigeneFirma_CheckedChanged(sender As Object, e As EventArgs) Handles cbxeigeneFirma.CheckedChanged
-        If Not cbxeigeneFirma.Checked Then
+    'Private Sub cbxeigeneFirma_CheckedChanged(sender As Object, e As EventArgs) Handles cbxeigeneFirma.CheckedChanged
+    '    If Not cbxeigeneFirma.Checked Then
 
-            If cboFirmaFMZOLL._value <> "" AndAlso IsNumeric(cboFirmaFMZOLL._value) Then
-                loadBenachrichtiungenListe(CInt(cboFirmaFMZOLL._value))
+    '        If cboFirmaFMZOLL._value <> "" AndAlso IsNumeric(cboFirmaFMZOLL._value) Then
+    '            loadBenachrichtiungenListe(CInt(cboFirmaFMZOLL._value))
 
-            Else
+    '        Else
 
-                loadBenachrichtiungenListe()
+    '            loadBenachrichtiungenListe()
 
-            End If
-        Else
-            loadBenachrichtiungenListe()
-        End If
+    '        End If
+    '    Else
+    '        loadBenachrichtiungenListe()
+    '    End If
 
-    End Sub
+    'End Sub
 
     Private Sub loadBenachrichtiungenListe(Optional FIRMAID As Integer = -1)
 
@@ -1897,12 +1898,23 @@ Public Class frmMitarbDetails
                                            CASE 
                                               WHEN mb_firmaID IS NULL THEN ' (ALLE)'
                                               ELSE ' (' + [tblFirma].Firma_Bez + ')'
-                                          END as mb_object, mb_id
+                                          END as mb_object, mb_id, mb_firmaID
 
                                         FROM [ADMIN].[dbo].[tblEMailbenachrichtigungen]
-                                        inner join [VERAG].[dbo].[tblFirma] on [mb_firmaID] = [tblFirma].Firma_ID" & IIf(FIRMAID > 0, " AND [tblFirma].Firma_ID = " & FIRMAID, "") & " order by mb_object,mb_firmaID", "ADMIN")
+                                        left join [VERAG].[dbo].[tblFirma] on [mb_firmaID] = [tblFirma].Firma_ID order by mb_object,mb_firmaID", "ADMIN")
         For Each r As DataRow In dt_Bebachrichtigungen.Rows
+            Dim edit As Boolean = True
+            If FIRMAID > 0 Then
+                If Not IsDBNull(r.Item("mb_firmaID")) AndAlso IsNumeric(r.Item("mb_firmaID")) AndAlso FIRMAID <> CInt((r.Item("mb_firmaID"))) Then
+                    edit = False
+                End If
+
+            End If
+
             clInterneMailBenachrichtigungen.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(r.Item("mb_object"), r.Item("mb_id")))
+
+
+
         Next
 
     End Sub