Version, Mialbenachrichtungen, etc.

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!)

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