Verwahrung, Mitarbeiter, Fakt, etc.

2026-04-15 10:11:20 +02:00
parent 68309d46e2
commit 25a802f2a6
6 changed files with 256 additions and 127 deletions
--- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
@@ -80,6 +80,8 @@ Partial Class frmMitarbDetails
        Me.lbSprachen = New VERAG_PROG_ALLGEMEIN.MyListBox()
        Me.tabParameter = New System.Windows.Forms.TabPage()
        Me.dgvUserParameter = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.tabBenachrichtigungen = New System.Windows.Forms.TabPage()
+        Me.clInterneMailBenachrichtigungen = New System.Windows.Forms.CheckedListBox()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
        Me.cboFunktion = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -258,8 +260,7 @@ 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.tabBenachrichtigungen = New System.Windows.Forms.TabPage()
-        Me.clInterneMailBenachrichtigungen = New System.Windows.Forms.CheckedListBox()
+        Me.cbxeigeneFirma = New System.Windows.Forms.CheckBox()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.TabControl2.SuspendLayout()
@@ -271,6 +272,7 @@ Partial Class frmMitarbDetails
        Me.TabPage7.SuspendLayout()
        Me.tabParameter.SuspendLayout()
        CType(Me.dgvUserParameter, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.tabBenachrichtigungen.SuspendLayout()
        Me.GroupBox2.SuspendLayout()
        Me.GroupBox1.SuspendLayout()
        CType(Me.picFoto, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -287,7 +289,6 @@ Partial Class frmMitarbDetails
        CType(Me.dgvData, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.TabPage6.SuspendLayout()
        CType(Me.dgvSessions, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.tabBenachrichtigungen.SuspendLayout()
        Me.SuspendLayout()
        '
        'PictureBox1
@@ -934,6 +935,27 @@ Partial Class frmMitarbDetails
        Me.dgvUserParameter.Size = New System.Drawing.Size(436, 168)
        Me.dgvUserParameter.TabIndex = 0
        '
+        'tabBenachrichtigungen
+        '
+        Me.tabBenachrichtigungen.Controls.Add(Me.cbxeigeneFirma)
+        Me.tabBenachrichtigungen.Controls.Add(Me.clInterneMailBenachrichtigungen)
+        Me.tabBenachrichtigungen.Location = New System.Drawing.Point(4, 22)
+        Me.tabBenachrichtigungen.Name = "tabBenachrichtigungen"
+        Me.tabBenachrichtigungen.Size = New System.Drawing.Size(442, 174)
+        Me.tabBenachrichtigungen.TabIndex = 6
+        Me.tabBenachrichtigungen.Text = "Benachrichtigungen"
+        Me.tabBenachrichtigungen.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.Name = "clInterneMailBenachrichtigungen"
+        Me.clInterneMailBenachrichtigungen.Size = New System.Drawing.Size(363, 169)
+        Me.clInterneMailBenachrichtigungen.TabIndex = 98
+        '
        'Label4
        '
        Me.Label4.AutoSize = True
@@ -2988,23 +3010,16 @@ Partial Class frmMitarbDetails
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
        Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
        '
-        'tabBenachrichtigungen
+        'cbxeigeneFirma
        '
-        Me.tabBenachrichtigungen.Controls.Add(Me.clInterneMailBenachrichtigungen)
-        Me.tabBenachrichtigungen.Location = New System.Drawing.Point(4, 22)
-        Me.tabBenachrichtigungen.Name = "tabBenachrichtigungen"
-        Me.tabBenachrichtigungen.Size = New System.Drawing.Size(442, 174)
-        Me.tabBenachrichtigungen.TabIndex = 6
-        Me.tabBenachrichtigungen.Text = "Benachrichtigungen"
-        Me.tabBenachrichtigungen.UseVisualStyleBackColor = True
-        '
-        'clInterneMailBenachrichtigungen
-        '
-        Me.clInterneMailBenachrichtigungen.FormattingEnabled = True
-        Me.clInterneMailBenachrichtigungen.Location = New System.Drawing.Point(3, 3)
-        Me.clInterneMailBenachrichtigungen.Name = "clInterneMailBenachrichtigungen"
-        Me.clInterneMailBenachrichtigungen.Size = New System.Drawing.Size(426, 169)
-        Me.clInterneMailBenachrichtigungen.TabIndex = 98
+        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
        '
@@ -3036,6 +3051,8 @@ Partial Class frmMitarbDetails
        Me.TabPage7.ResumeLayout(False)
        Me.tabParameter.ResumeLayout(False)
        CType(Me.dgvUserParameter, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.tabBenachrichtigungen.ResumeLayout(False)
+        Me.tabBenachrichtigungen.PerformLayout()
        Me.GroupBox2.ResumeLayout(False)
        Me.GroupBox2.PerformLayout()
        Me.GroupBox1.ResumeLayout(False)
@@ -3057,7 +3074,6 @@ Partial Class frmMitarbDetails
        Me.TabPage6.ResumeLayout(False)
        Me.TabPage6.PerformLayout()
        CType(Me.dgvSessions, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.tabBenachrichtigungen.ResumeLayout(False)
        Me.ResumeLayout(False)

    End Sub
@@ -3297,4 +3313,5 @@ Partial Class frmMitarbDetails
    Friend WithEvents dgvSessions As VERAG_PROG_ALLGEMEIN.MyDatagridview
    Friend WithEvents tabBenachrichtigungen As TabPage
    Friend WithEvents clInterneMailBenachrichtigungen As CheckedListBox
+    Friend WithEvents cbxeigeneFirma As CheckBox
 End Class
--- a/UID/Mitarbeiter/frmMitarbDetails.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.vb
@@ -1,5 +1,6 @@

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

@@ -149,18 +150,6 @@ Public Class frmMitarbDetails
        clbTimasMehreFirmen.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
        clbTimasMehreFirmen.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR"))

-        clInterneMailBenachrichtigungen.Items.Clear()
-        Dim dt_Bebachrichtigungen As DataTable = SQL.loadDgvBySql("SELECT  mb_object +
-                                           CASE 
-                                              WHEN mb_firmaID IS NULL THEN ' (ALLE)'
-                                              ELSE ' (' + [tblFirma].Firma_Bez + ')'
-                                          END as mb_object, mb_id
-
-                                        FROM [ADMIN].[dbo].[tblEMailbenachrichtigungen]
-                                        inner join [VERAG].[dbo].[tblFirma] on [mb_firmaID] = [tblFirma].Firma_ID", "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


        cbxClientTimas.Items.Clear()
@@ -177,6 +166,7 @@ Public Class frmMitarbDetails

        cbxClientTimas.SelectedIndex = 0

+        loadBenachrichtiungenListe()

        cboFirma.Items.Clear()
        cboFirma.Items.Add("VERAG")
@@ -1875,5 +1865,39 @@ Public Class frmMitarbDetails


    End Sub
+
+    Private Sub cbxeigeneFirma_CheckedChanged(sender As Object, e As EventArgs) Handles cbxeigeneFirma.CheckedChanged
+        If cbxeigeneFirma.Checked Then
+
+            If cboFirmaFMZOLL._value <> "" AndAlso IsNumeric(cboFirmaFMZOLL._value) Then
+                loadBenachrichtiungenListe(CInt(cboFirmaFMZOLL._value))
+
+            Else
+
+                loadBenachrichtiungenListe()
+
+            End If
+        Else
+            loadBenachrichtiungenListe()
+        End If
+
+    End Sub
+
+    Private Sub loadBenachrichtiungenListe(Optional FIRMAID As Integer = -1)
+
+        clInterneMailBenachrichtigungen.Items.Clear()
+        Dim dt_Bebachrichtigungen As DataTable = SQL.loadDgvBySql("SELECT  mb_object +
+                                           CASE 
+                                              WHEN mb_firmaID IS NULL THEN ' (ALLE)'
+                                              ELSE ' (' + [tblFirma].Firma_Bez + ')'
+                                          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")
+        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
+
+    End Sub
 End Class