diff --git a/UID/Mitarbeiter/frmMitarbDetails.vb b/UID/Mitarbeiter/frmMitarbDetails.vb
index b9c7f79..96eb9c0 100644
--- a/UID/Mitarbeiter/frmMitarbDetails.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.vb
@@ -20,7 +20,7 @@ Public Class frmMitarbDetails
Private UID As New cMitarbeiter
Private berechtigungen As New List(Of cBerechtigungen)
Public mid As Integer = -1
- Private isUpdate As Boolean = False
+ Public isUpdate As Boolean = False
Private mitarbeiter As New VERAG_PROG_ALLGEMEIN.cMitarbeiter
Private usrBerechtigung As New List(Of cUserBerechtigungen)
Private usrBerechtigungNEU As New List(Of cUserBerechtigungen)
@@ -47,6 +47,15 @@ Public Class frmMitarbDetails
End Sub
+ Sub New(mitarbeiter As cMitarbeiter)
+
+ ' Dieser Aufruf ist für den Designer erforderlich.
+ InitializeComponent()
+
+ ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
+
+ End Sub
+
Private Sub frmMitarbDetails_Load(sender As Object, e As EventArgs) Handles MyBase.Load
cboFirmaFMZOLL.fillWithSQL("SELECT[Firma_ID],[Firma_Bez] FROM [tblFirma] ", True, "FMZOLL", True)
@@ -235,8 +244,9 @@ Public Class frmMitarbDetails
Next
End Sub
- Private Sub initMitarbeiter()
- isUpdate = True
+ Private Sub initMitarbeiter(Optional _isUpdate As Boolean = True)
+ isUpdate = _isUpdate
+ 'isUpdate = True
' mit_id.Text = mitarbeiter.mit_id
Label48.Text = mitarbeiter.mit_id
txtUsername.Text = mitarbeiter.mit_username
diff --git a/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb b/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb
index e7e3eb4..3f44174 100644
--- a/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb
+++ b/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb
@@ -41,6 +41,8 @@ Partial Class usrCntlMitarbeiter
Me.dgvAMBAR = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.TabPage6 = New System.Windows.Forms.TabPage()
Me.dgvFRONTOFFICE = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+ Me.TabPage7 = New System.Windows.Forms.TabPage()
+ Me.dgvVERIMEX = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Panel1 = New System.Windows.Forms.Panel()
Me.cbx = New System.Windows.Forms.CheckBox()
Me.txtSuche = New System.Windows.Forms.TextBox()
@@ -48,8 +50,8 @@ Partial Class usrCntlMitarbeiter
Me.Button2 = New System.Windows.Forms.Button()
Me.Label1 = New System.Windows.Forms.Label()
Me.Panel3 = New System.Windows.Forms.Panel()
- Me.TabPage7 = New System.Windows.Forms.TabPage()
- Me.dgvVERIMEX = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+ Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.UserKopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.Panel2.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TabPage1.SuspendLayout()
@@ -64,10 +66,11 @@ Partial Class usrCntlMitarbeiter
CType(Me.dgvAMBAR, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPage6.SuspendLayout()
CType(Me.dgvFRONTOFFICE, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.Panel1.SuspendLayout()
- Me.Panel3.SuspendLayout()
Me.TabPage7.SuspendLayout()
CType(Me.dgvVERIMEX, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.Panel1.SuspendLayout()
+ Me.Panel3.SuspendLayout()
+ Me.ContextMenuStrip1.SuspendLayout()
Me.SuspendLayout()
'
'Button6
@@ -269,6 +272,27 @@ Partial Class usrCntlMitarbeiter
Me.dgvFRONTOFFICE.Size = New System.Drawing.Size(875, 616)
Me.dgvFRONTOFFICE.TabIndex = 26
'
+ 'TabPage7
+ '
+ Me.TabPage7.Controls.Add(Me.dgvVERIMEX)
+ Me.TabPage7.Location = New System.Drawing.Point(4, 22)
+ Me.TabPage7.Name = "TabPage7"
+ Me.TabPage7.Padding = New System.Windows.Forms.Padding(3)
+ Me.TabPage7.Size = New System.Drawing.Size(881, 622)
+ Me.TabPage7.TabIndex = 6
+ Me.TabPage7.Text = "VERIMEX"
+ Me.TabPage7.UseVisualStyleBackColor = True
+ '
+ 'dgvVERIMEX
+ '
+ Me.dgvVERIMEX.AKTUALISIERUNGS_INTERVALL = -1
+ Me.dgvVERIMEX.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+ Me.dgvVERIMEX.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.dgvVERIMEX.Location = New System.Drawing.Point(3, 3)
+ Me.dgvVERIMEX.Name = "dgvVERIMEX"
+ Me.dgvVERIMEX.Size = New System.Drawing.Size(875, 616)
+ Me.dgvVERIMEX.TabIndex = 27
+ '
'Panel1
'
Me.Panel1.Controls.Add(Me.cbx)
@@ -336,26 +360,17 @@ Partial Class usrCntlMitarbeiter
Me.Panel3.Size = New System.Drawing.Size(889, 648)
Me.Panel3.TabIndex = 27
'
- 'TabPage7
+ 'ContextMenuStrip1
'
- Me.TabPage7.Controls.Add(Me.dgvVERIMEX)
- Me.TabPage7.Location = New System.Drawing.Point(4, 22)
- Me.TabPage7.Name = "TabPage7"
- Me.TabPage7.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPage7.Size = New System.Drawing.Size(881, 622)
- Me.TabPage7.TabIndex = 6
- Me.TabPage7.Text = "VERIMEX"
- Me.TabPage7.UseVisualStyleBackColor = True
+ Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UserKopierenToolStripMenuItem})
+ Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
+ Me.ContextMenuStrip1.Size = New System.Drawing.Size(147, 26)
'
- 'dgvVERIMEX
+ 'UserKopierenToolStripMenuItem
'
- Me.dgvVERIMEX.AKTUALISIERUNGS_INTERVALL = -1
- Me.dgvVERIMEX.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- Me.dgvVERIMEX.Dock = System.Windows.Forms.DockStyle.Fill
- Me.dgvVERIMEX.Location = New System.Drawing.Point(3, 3)
- Me.dgvVERIMEX.Name = "dgvVERIMEX"
- Me.dgvVERIMEX.Size = New System.Drawing.Size(875, 616)
- Me.dgvVERIMEX.TabIndex = 27
+ Me.UserKopierenToolStripMenuItem.Name = "UserKopierenToolStripMenuItem"
+ Me.UserKopierenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+ Me.UserKopierenToolStripMenuItem.Text = "User kopieren"
'
'usrCntlMitarbeiter
'
@@ -381,11 +396,12 @@ Partial Class usrCntlMitarbeiter
CType(Me.dgvAMBAR, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabPage6.ResumeLayout(False)
CType(Me.dgvFRONTOFFICE, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.TabPage7.ResumeLayout(False)
+ CType(Me.dgvVERIMEX, System.ComponentModel.ISupportInitialize).EndInit()
Me.Panel1.ResumeLayout(False)
Me.Panel1.PerformLayout()
Me.Panel3.ResumeLayout(False)
- Me.TabPage7.ResumeLayout(False)
- CType(Me.dgvVERIMEX, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.ContextMenuStrip1.ResumeLayout(False)
Me.ResumeLayout(False)
End Sub
@@ -416,4 +432,6 @@ Partial Class usrCntlMitarbeiter
Friend WithEvents dgvFRONTOFFICE As VERAG_PROG_ALLGEMEIN.MyDatagridview
Friend WithEvents TabPage7 As TabPage
Friend WithEvents dgvVERIMEX As VERAG_PROG_ALLGEMEIN.MyDatagridview
+ Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
+ Friend WithEvents UserKopierenToolStripMenuItem As ToolStripMenuItem
End Class
diff --git a/UID/Mitarbeiter/usrCntlMitarbeiter.resx b/UID/Mitarbeiter/usrCntlMitarbeiter.resx
index 1af7de1..279a447 100644
--- a/UID/Mitarbeiter/usrCntlMitarbeiter.resx
+++ b/UID/Mitarbeiter/usrCntlMitarbeiter.resx
@@ -117,4 +117,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 17, 17
+
\ No newline at end of file
diff --git a/UID/Mitarbeiter/usrCntlMitarbeiter.vb b/UID/Mitarbeiter/usrCntlMitarbeiter.vb
index ac96e6e..bc67a22 100644
--- a/UID/Mitarbeiter/usrCntlMitarbeiter.vb
+++ b/UID/Mitarbeiter/usrCntlMitarbeiter.vb
@@ -1,4 +1,7 @@
Imports System.ComponentModel
+Imports GrapeCity.Viewer.Common.Model
+Imports VERAG_PROG_ALLGEMEIN
+Imports VERAG_PROG_ALLGEMEIN.TESTJSON
Public Class usrCntlMitarbeiter
@@ -370,4 +373,106 @@ Public Class usrCntlMitarbeiter
Private Sub cbx_CheckedChanged(sender As Object, e As EventArgs) Handles cbx.CheckStateChanged
Tabelle_anzeigen()
End Sub
+
+ Private Sub UserKopierenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles UserKopierenToolStripMenuItem.Click
+ If TabControl1.SelectedIndex = 0 Then
+
+ If dgvVERAG.SelectedRows.Count <> 1 Then Exit Sub
+ copyUser(dgvVERAG.CurrentRow.Cells(0).Value)
+
+ ElseIf TabControl1.SelectedIndex = 1 Then
+
+ If dgvATILLA.SelectedRows.Count <> 1 Then Exit Sub
+ copyUser(dgvATILLA.CurrentRow.Cells(0).Value)
+
+ ElseIf TabControl1.SelectedIndex = 2 Then
+
+ If dgvIMEX.SelectedRows.Count <> 1 Then Exit Sub
+ copyUser(dgvIMEX.CurrentRow.Cells(0).Value)
+
+ ElseIf TabControl1.SelectedIndex = 3 Then
+
+ If dgvUNISPED.SelectedRows.Count <> 1 Then Exit Sub
+ copyUser(dgvUNISPED.CurrentRow.Cells(0).Value)
+
+ ElseIf TabControl1.SelectedIndex = 4 Then
+
+ If dgvAMBAR.SelectedRows.Count <> 1 Then Exit Sub
+ copyUser(dgvAMBAR.CurrentRow.Cells(0).Value)
+
+ ElseIf TabControl1.SelectedIndex = 5 Then
+
+ If dgvFRONTOFFICE.SelectedRows.Count <> 1 Then Exit Sub
+ copyUser(dgvFRONTOFFICE.CurrentRow.Cells(0).Value)
+
+ ElseIf TabControl1.SelectedIndex = 5 Then
+
+ If dgvVERIMEX.SelectedRows.Count <> 1 Then Exit Sub
+ copyUser(dgvVERIMEX.CurrentRow.Cells(0).Value)
+
+ End If
+ End Sub
+
+ Private Sub dgvVerag_CellMouseDown(ByVal sender As Object, ByVal e As DataGridViewCellMouseEventArgs) Handles dgvVERAG.CellMouseDown, dgvVERIMEX.CellMouseDown, dgvUNISPED.CellMouseDown, dgvIMEX.CellMouseDown, dgvFRONTOFFICE.CellMouseDown, dgvATILLA.CellMouseDown, dgvAMBAR.CellMouseDown
+
+ If e.Button = Windows.Forms.MouseButtons.Right AndAlso e.RowIndex > -1 Then
+ Dim rowClicked As DataGridView.HitTestInfo
+ Select Case sender.name
+ Case "dgvVERAG"
+ rowClicked = dgvVERAG.HitTest(e.X, e.Y)
+ dgvVERAG.ClearSelection()
+ Me.dgvVERAG.Rows(e.RowIndex).Selected = True
+
+ Case "dgvVERIMEX"
+ rowClicked = dgvVERIMEX.HitTest(e.X, e.Y)
+ dgvVERIMEX.ClearSelection()
+ Me.dgvVERIMEX.Rows(e.RowIndex).Selected = True
+
+ Case "dgvUNISPED"
+ rowClicked = dgvUNISPED.HitTest(e.X, e.Y)
+ dgvUNISPED.ClearSelection()
+ Me.dgvUNISPED.Rows(e.RowIndex).Selected = True
+
+ Case "dgvIMEX"
+ rowClicked = dgvIMEX.HitTest(e.X, e.Y)
+ dgvIMEX.ClearSelection()
+ Me.dgvIMEX.Rows(e.RowIndex).Selected = True
+
+ Case "dgvFRONTOFFICE"
+ rowClicked = dgvFRONTOFFICE.HitTest(e.X, e.Y)
+ dgvFRONTOFFICE.ClearSelection()
+ Me.dgvFRONTOFFICE.Rows(e.RowIndex).Selected = True
+
+ Case "dgvATILLA"
+ rowClicked = dgvATILLA.HitTest(e.X, e.Y)
+ dgvATILLA.ClearSelection()
+ Me.dgvATILLA.Rows(e.RowIndex).Selected = True
+
+ Case Else
+
+ rowClicked = dgvAMBAR.HitTest(e.X, e.Y)
+ dgvAMBAR.ClearSelection()
+ Me.dgvAMBAR.Rows(e.RowIndex).Selected = True
+
+ End Select
+
+ ContextMenuStrip1.Show(MousePosition.X, MousePosition.Y)
+
+ End If
+
+ End Sub
+ Private Sub copyUser(id As Integer)
+
+
+ Me.Cursor = Cursors.WaitCursor
+ Dim frmMitarbDetails As New frmMitarbDetails()
+
+ frmMitarbDetails.mid = id
+ frmMitarbDetails.Show(Me)
+ frmMitarbDetails.isUpdate = False
+ frmMitarbDetails.txtVname.Text = "Kopie von" & frmMitarbDetails.txtVname.Text
+ Me.Cursor = Cursors.Default
+
+
+ End Sub
End Class