div. Änderungen
This commit is contained in:
25
UID/Mitarbeiter/frmMitarbDetails.Designer.vb
generated
25
UID/Mitarbeiter/frmMitarbDetails.Designer.vb
generated
@@ -258,6 +258,8 @@ 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()
|
||||
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.Panel1.SuspendLayout()
|
||||
Me.TabControl2.SuspendLayout()
|
||||
@@ -285,6 +287,7 @@ 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
|
||||
@@ -413,6 +416,7 @@ Partial Class frmMitarbDetails
|
||||
Me.tbcntr.Controls.Add(Me.TabPage5)
|
||||
Me.tbcntr.Controls.Add(Me.TabPage7)
|
||||
Me.tbcntr.Controls.Add(Me.tabParameter)
|
||||
Me.tbcntr.Controls.Add(Me.tabBenachrichtigungen)
|
||||
Me.tbcntr.Location = New System.Drawing.Point(2, 539)
|
||||
Me.tbcntr.Name = "tbcntr"
|
||||
Me.tbcntr.SelectedIndex = 0
|
||||
@@ -2984,6 +2988,24 @@ Partial Class frmMitarbDetails
|
||||
Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
|
||||
Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
|
||||
'
|
||||
'tabBenachrichtigungen
|
||||
'
|
||||
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
|
||||
'
|
||||
'frmMitarbDetails
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
@@ -3035,6 +3057,7 @@ 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
|
||||
@@ -3272,4 +3295,6 @@ Partial Class frmMitarbDetails
|
||||
Friend WithEvents Label74 As Label
|
||||
Friend WithEvents DateTimePicker1 As DateTimePicker
|
||||
Friend WithEvents dgvSessions As VERAG_PROG_ALLGEMEIN.MyDatagridview
|
||||
Friend WithEvents tabBenachrichtigungen As TabPage
|
||||
Friend WithEvents clInterneMailBenachrichtigungen As CheckedListBox
|
||||
End Class
|
||||
|
||||
@@ -149,6 +149,20 @@ 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()
|
||||
cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
|
||||
cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR"))
|
||||
@@ -454,6 +468,17 @@ Public Class frmMitarbDetails
|
||||
Next
|
||||
End If
|
||||
|
||||
|
||||
If mitarbeiter.mit_EMailbenachrichtigungen IsNot Nothing AndAlso mitarbeiter.mit_EMailbenachrichtigungen <> "" Then
|
||||
For Each f In mitarbeiter.mit_EMailbenachrichtigungen.ToString.Split(",")
|
||||
For i = 0 To clInterneMailBenachrichtigungen.Items.Count - 1
|
||||
If DirectCast(clInterneMailBenachrichtigungen.Items(i), VERAG_PROG_ALLGEMEIN.MyListItem).Value.ToString = f.ToString Then
|
||||
clInterneMailBenachrichtigungen.SetItemChecked(i, True)
|
||||
End If
|
||||
Next
|
||||
Next
|
||||
End If
|
||||
|
||||
' picFoto.ImageLocation = mitarbeiter.mit_foto
|
||||
End Sub
|
||||
|
||||
@@ -773,6 +798,16 @@ Public Class frmMitarbDetails
|
||||
mitarbeiter.mit_timasFirmen = mitarbeiter.mit_timasFirmen.ToString.Substring(0, mitarbeiter.mit_timasFirmen.ToString.Length - 1)
|
||||
End If
|
||||
|
||||
mitarbeiter.mit_EMailbenachrichtigungen = ""
|
||||
If mitarbeiter.mit_EMailbenachrichtigungen = "" Then
|
||||
For Each i In clInterneMailBenachrichtigungen.CheckedItems
|
||||
mitarbeiter.mit_EMailbenachrichtigungen &= DirectCast(i, VERAG_PROG_ALLGEMEIN.MyListItem).Value & ","
|
||||
Next
|
||||
End If
|
||||
If mitarbeiter.mit_EMailbenachrichtigungen <> "" And mitarbeiter.mit_EMailbenachrichtigungen.ToString.EndsWith(",") Then
|
||||
mitarbeiter.mit_EMailbenachrichtigungen = mitarbeiter.mit_EMailbenachrichtigungen.ToString.Substring(0, mitarbeiter.mit_EMailbenachrichtigungen.ToString.Length - 1)
|
||||
End If
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
Imports System.ComponentModel
|
||||
Imports System.Net
|
||||
Imports System.Text
|
||||
Imports System.Windows.Controls
|
||||
Imports System.Windows.Forms.VisualStyles.VisualStyleElement
|
||||
Imports GrapeCity.Viewer.Common.Model
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
Imports VERAG_PROG_ALLGEMEIN.cChilkat_Helper
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user