Version, Mialbenachrichtungen, etc.

2026-04-15 16:27:01 +02:00
parent 2cd8fd19fd
commit 2593c75d22
6 changed files with 86 additions and 38 deletions
--- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
@@ -81,6 +81,7 @@ Partial Class frmMitarbDetails
        Me.tabParameter = New System.Windows.Forms.TabPage()
        Me.dgvUserParameter = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.tabBenachrichtigungen = New System.Windows.Forms.TabPage()
+        Me.cbxeigeneFirma = New System.Windows.Forms.CheckBox()
        Me.clInterneMailBenachrichtigungen = New System.Windows.Forms.CheckedListBox()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
@@ -260,7 +261,6 @@ Partial Class frmMitarbDetails
        Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker()
        Me.dgvSessions = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.cbxeigeneFirma = New System.Windows.Forms.CheckBox()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.TabControl2.SuspendLayout()
@@ -943,17 +943,28 @@ Partial Class frmMitarbDetails
        Me.tabBenachrichtigungen.Name = "tabBenachrichtigungen"
        Me.tabBenachrichtigungen.Size = New System.Drawing.Size(442, 174)
        Me.tabBenachrichtigungen.TabIndex = 6
-        Me.tabBenachrichtigungen.Text = "Benachrichtigungen"
+        Me.tabBenachrichtigungen.Text = "interne Mail-Benachricht."
        Me.tabBenachrichtigungen.UseVisualStyleBackColor = True
        '
+        'cbxeigeneFirma
+        '
+        Me.cbxeigeneFirma.AutoSize = True
+        Me.cbxeigeneFirma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxeigeneFirma.Location = New System.Drawing.Point(395, 3)
+        Me.cbxeigeneFirma.Name = "cbxeigeneFirma"
+        Me.cbxeigeneFirma.Size = New System.Drawing.Size(42, 17)
+        Me.cbxeigeneFirma.TabIndex = 116
+        Me.cbxeigeneFirma.Text = "alle"
+        Me.cbxeigeneFirma.UseVisualStyleBackColor = True
+        '
        'clInterneMailBenachrichtigungen
        '
        Me.clInterneMailBenachrichtigungen.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.clInterneMailBenachrichtigungen.FormattingEnabled = True
-        Me.clInterneMailBenachrichtigungen.Location = New System.Drawing.Point(76, 3)
+        Me.clInterneMailBenachrichtigungen.Location = New System.Drawing.Point(0, 2)
        Me.clInterneMailBenachrichtigungen.Name = "clInterneMailBenachrichtigungen"
-        Me.clInterneMailBenachrichtigungen.Size = New System.Drawing.Size(363, 169)
+        Me.clInterneMailBenachrichtigungen.Size = New System.Drawing.Size(386, 169)
        Me.clInterneMailBenachrichtigungen.TabIndex = 98
        '
        'Label4
@@ -3010,17 +3021,6 @@ Partial Class frmMitarbDetails
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
        Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
        '
-        'cbxeigeneFirma
-        '
-        Me.cbxeigeneFirma.AutoSize = True
-        Me.cbxeigeneFirma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxeigeneFirma.Location = New System.Drawing.Point(5, 3)
-        Me.cbxeigeneFirma.Name = "cbxeigeneFirma"
-        Me.cbxeigeneFirma.Size = New System.Drawing.Size(71, 17)
-        Me.cbxeigeneFirma.TabIndex = 116
-        Me.cbxeigeneFirma.Text = "eig. Firma"
-        Me.cbxeigeneFirma.UseVisualStyleBackColor = True
-        '
        'frmMitarbDetails
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
--- a/UID/Mitarbeiter/frmMitarbDetails.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.vb
@@ -166,7 +166,6 @@ Public Class frmMitarbDetails

        cbxClientTimas.SelectedIndex = 0

-        loadBenachrichtiungenListe()

        cboFirma.Items.Clear()
        cboFirma.Items.Add("VERAG")
@@ -448,6 +447,16 @@ Public Class frmMitarbDetails

        cbxTimasMehrereFirmen.Checked = mitarbeiter.mit_timasMehrereFirmen

+        If cboFirmaFMZOLL._value <> "" AndAlso IsNumeric(cboFirmaFMZOLL._value) Then
+            loadBenachrichtiungenListe(CInt(cboFirmaFMZOLL._value))
+
+        Else
+
+            loadBenachrichtiungenListe()
+
+        End If
+
+
        If mitarbeiter.mit_timasFirmen IsNot Nothing AndAlso mitarbeiter.mit_timasFirmen <> "" Then
            For Each f In mitarbeiter.mit_timasFirmen.ToString.Split(",")
                For i = 0 To clbTimasMehreFirmen.Items.Count - 1
@@ -1867,7 +1876,7 @@ Public Class frmMitarbDetails
    End Sub

    Private Sub cbxeigeneFirma_CheckedChanged(sender As Object, e As EventArgs) Handles cbxeigeneFirma.CheckedChanged
-        If cbxeigeneFirma.Checked Then
+        If Not cbxeigeneFirma.Checked Then

            If cboFirmaFMZOLL._value <> "" AndAlso IsNumeric(cboFirmaFMZOLL._value) Then
                loadBenachrichtiungenListe(CInt(cboFirmaFMZOLL._value))
@@ -1893,7 +1902,7 @@ Public Class frmMitarbDetails
                                          END as mb_object, mb_id

                                        FROM [ADMIN].[dbo].[tblEMailbenachrichtigungen]
-                                        inner join [VERAG].[dbo].[tblFirma] on [mb_firmaID] = [tblFirma].Firma_ID" & IIf(FIRMAID > 0, " AND [tblFirma].Firma_ID = " & FIRMAID, ""), "ADMIN")
+                                        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")
        For Each r As DataRow In dt_Bebachrichtigungen.Rows
            clInterneMailBenachrichtigungen.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(r.Item("mb_object"), r.Item("mb_id")))
        Next
--- a/UID/frmMain.Designer.vb
+++ b/UID/frmMain.Designer.vb
@@ -51,6 +51,7 @@ 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()
@@ -111,6 +112,7 @@ Partial Class frmMain
        'Panel3
        '
        Me.Panel3.BackColor = System.Drawing.Color.White
+        Me.Panel3.Controls.Add(Me.btnInterneBenachrichtigungen)
        Me.Panel3.Controls.Add(Me.lblVersion)
        Me.Panel3.Controls.Add(Me.btnAuditFlow)
        Me.Panel3.Controls.Add(Me.btnMailroutine)
@@ -149,7 +151,7 @@ Partial Class frmMain
        '
        Me.btnAuditFlow.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnAuditFlow.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnAuditFlow.Location = New System.Drawing.Point(12, 243)
+        Me.btnAuditFlow.Location = New System.Drawing.Point(12, 287)
        Me.btnAuditFlow.Name = "btnAuditFlow"
        Me.btnAuditFlow.Size = New System.Drawing.Size(94, 33)
        Me.btnAuditFlow.TabIndex = 44
@@ -161,7 +163,7 @@ Partial Class frmMain
        '
        Me.btnMailroutine.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnMailroutine.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnMailroutine.Location = New System.Drawing.Point(12, 637)
+        Me.btnMailroutine.Location = New System.Drawing.Point(12, 648)
        Me.btnMailroutine.Name = "btnMailroutine"
        Me.btnMailroutine.Size = New System.Drawing.Size(94, 33)
        Me.btnMailroutine.TabIndex = 43
@@ -173,7 +175,7 @@ Partial Class frmMain
        '
        Me.btnAPIZugang.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnAPIZugang.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnAPIZugang.Location = New System.Drawing.Point(12, 558)
+        Me.btnAPIZugang.Location = New System.Drawing.Point(12, 569)
        Me.btnAPIZugang.Name = "btnAPIZugang"
        Me.btnAPIZugang.Size = New System.Drawing.Size(94, 33)
        Me.btnAPIZugang.TabIndex = 42
@@ -185,7 +187,7 @@ Partial Class frmMain
        '
        Me.btnDatenarchiv.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnDatenarchiv.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnDatenarchiv.Location = New System.Drawing.Point(12, 393)
+        Me.btnDatenarchiv.Location = New System.Drawing.Point(12, 404)
        Me.btnDatenarchiv.Name = "btnDatenarchiv"
        Me.btnDatenarchiv.Size = New System.Drawing.Size(94, 33)
        Me.btnDatenarchiv.TabIndex = 41
@@ -197,7 +199,7 @@ Partial Class frmMain
        '
        Me.btnFehler.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnFehler.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnFehler.Location = New System.Drawing.Point(12, 354)
+        Me.btnFehler.Location = New System.Drawing.Point(12, 365)
        Me.btnFehler.Name = "btnFehler"
        Me.btnFehler.Size = New System.Drawing.Size(94, 33)
        Me.btnFehler.TabIndex = 40
@@ -209,7 +211,7 @@ Partial Class frmMain
        '
        Me.btnAPI.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnAPI.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnAPI.Location = New System.Drawing.Point(12, 315)
+        Me.btnAPI.Location = New System.Drawing.Point(12, 326)
        Me.btnAPI.Name = "btnAPI"
        Me.btnAPI.Size = New System.Drawing.Size(94, 33)
        Me.btnAPI.TabIndex = 39
@@ -221,7 +223,7 @@ Partial Class frmMain
        '
        Me.btnHomepage.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnHomepage.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnHomepage.Location = New System.Drawing.Point(12, 479)
+        Me.btnHomepage.Location = New System.Drawing.Point(12, 490)
        Me.btnHomepage.Name = "btnHomepage"
        Me.btnHomepage.Size = New System.Drawing.Size(94, 33)
        Me.btnHomepage.TabIndex = 38
@@ -244,7 +246,7 @@ Partial Class frmMain
        'btnUpdate
        '
        Me.btnUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnUpdate.Location = New System.Drawing.Point(12, 597)
+        Me.btnUpdate.Location = New System.Drawing.Point(12, 608)
        Me.btnUpdate.Name = "btnUpdate"
        Me.btnUpdate.Size = New System.Drawing.Size(94, 34)
        Me.btnUpdate.TabIndex = 37
@@ -289,7 +291,7 @@ Partial Class frmMain
        'Button6
        '
        Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button6.Location = New System.Drawing.Point(12, 518)
+        Me.Button6.Location = New System.Drawing.Point(12, 529)
        Me.Button6.Name = "Button6"
        Me.Button6.Size = New System.Drawing.Size(94, 34)
        Me.Button6.TabIndex = 33
@@ -342,6 +344,18 @@ 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!)
@@ -389,4 +403,5 @@ Partial Class frmMain
    Friend WithEvents btnMailroutine As Button
    Friend WithEvents btnAuditFlow As Button
    Friend WithEvents lblVersion As Label
+    Friend WithEvents btnInterneBenachrichtigungen As Button
 End Class
--- a/UID/frmMain.vb
+++ b/UID/frmMain.vb
@@ -262,4 +262,11 @@ Public Class frmMain
        Dim f As New frmAuditFlow
        f.Show(Me)
    End Sub
+
+
+
+    Private Sub btnInterneBenachrichtigungen_Click(sender As Object, e As EventArgs) Handles btnInterneBenachrichtigungen.Click
+        Dim f As New frminterneEmailBenachrichtigungen
+        f.Show(Me)
+    End Sub
 End Class