Merge branch 'ADMIN' of https://git.it.verag.ag/edv/ADMIN into ADMIN

2026-04-27 08:16:32 +02:00
parent 2ca938a997 f1bd09bdb7
commit 79dbfe0c43
6 changed files with 81 additions and 46 deletions
--- a/UID/Mitarbeiter/frmMitarbDetails.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.vb
@@ -1,8 +1,7 @@

 Imports System.Text.RegularExpressions
-Imports DocumentFormat.OpenXml.Drawing.Diagrams
+Imports Confluent.Kafka
 Imports VERAG_PROG_ALLGEMEIN
-Imports VERAG_PROG_ALLGEMEIN.TESTJSON

 Public Class frmMitarbDetails

@@ -1875,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)

@@ -1899,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
--- a/UID/frmMain.Designer.vb
+++ b/UID/frmMain.Designer.vb
@@ -33,6 +33,7 @@ Partial Class frmMain
        Me.TableAdapterManager1 = New ADMIN.DataSetBerechtigungenTableAdapters.TableAdapterManager()
        Me.pnlMain = New System.Windows.Forms.Panel()
        Me.Panel3 = New System.Windows.Forms.Panel()
+        Me.btnInterneBenachrichtigungen = New System.Windows.Forms.Button()
        Me.lblVersion = New System.Windows.Forms.Label()
        Me.btnAuditFlow = New System.Windows.Forms.Button()
        Me.btnMailroutine = New System.Windows.Forms.Button()
@@ -51,7 +52,6 @@ Partial Class frmMain
        Me.btnMitarbeiter = New System.Windows.Forms.Button()
        Me.Panel2 = New System.Windows.Forms.Panel()
        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
-        Me.btnInterneBenachrichtigungen = New System.Windows.Forms.Button()
        Me.Panel3.SuspendLayout()
        Me.Panel2.SuspendLayout()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -135,6 +135,18 @@ Partial Class frmMain
        Me.Panel3.Size = New System.Drawing.Size(137, 801)
        Me.Panel3.TabIndex = 32
        '
+        'btnInterneBenachrichtigungen
+        '
+        Me.btnInterneBenachrichtigungen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnInterneBenachrichtigungen.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnInterneBenachrichtigungen.Location = New System.Drawing.Point(12, 220)
+        Me.btnInterneBenachrichtigungen.Name = "btnInterneBenachrichtigungen"
+        Me.btnInterneBenachrichtigungen.Size = New System.Drawing.Size(94, 38)
+        Me.btnInterneBenachrichtigungen.TabIndex = 46
+        Me.btnInterneBenachrichtigungen.Text = "interne Infomails"
+        Me.btnInterneBenachrichtigungen.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnInterneBenachrichtigungen.UseVisualStyleBackColor = True
+        '
        'lblVersion
        '
        Me.lblVersion.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
@@ -344,18 +356,6 @@ Partial Class frmMain
        Me.PictureBox1.TabIndex = 31
        Me.PictureBox1.TabStop = False
        '
-        'btnInterneBenachrichtigungen
-        '
-        Me.btnInterneBenachrichtigungen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnInterneBenachrichtigungen.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnInterneBenachrichtigungen.Location = New System.Drawing.Point(12, 220)
-        Me.btnInterneBenachrichtigungen.Name = "btnInterneBenachrichtigungen"
-        Me.btnInterneBenachrichtigungen.Size = New System.Drawing.Size(94, 52)
-        Me.btnInterneBenachrichtigungen.TabIndex = 46
-        Me.btnInterneBenachrichtigungen.Text = "interne Mail-Benachr."
-        Me.btnInterneBenachrichtigungen.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnInterneBenachrichtigungen.UseVisualStyleBackColor = True
-        '
        'frmMain
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
--- a/UID/usrCntlAPI.vb
+++ b/UID/usrCntlAPI.vb
@@ -39,6 +39,7 @@ Public Class usrCntlAPI
        'cboType.fillWithSQL("SELECT distinct(api_Type) FROM [tblAPI] ", False, "ADMIN", True)
        cboType.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FTP", "FTP"))
        cboType.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MAIL", "MAIL"))
+        cboType.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("REST", "REST"))

        cboAPIArt.Items.Clear()
        cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
@@ -46,8 +47,11 @@ Public Class usrCntlAPI
        cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AVISO_OUT_BELEGMAIL", VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_BELEGMAIL))
        cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG_OUT_EZA", VERAG_PROG_ALLGEMEIN.cAPI_ART.VERAG_OUT_EZA))
        cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG_OUT_NCTS", VERAG_PROG_ALLGEMEIN.cAPI_ART.VERAG_OUT_NCTS))
-        cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MSE", VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_IN_MSE))
+        cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MULTISERVICE", VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_IN_MSE))
        cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MDM SAMMELRECHNUNG", VERAG_PROG_ALLGEMEIN.cAPI_ART.SDL_OUT_SAMMELRECHNUNG))
+        cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CREDITSAFE", VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_IN_CS))
+        cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SAMMELRECHNUNG", VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_SAMMELRECHNUNG))
+        cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EINZELRECHNUNG", VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_EINZELRECHNUNG))
        cboAPIArt.changeItem("")