merge
This commit is contained in:
@@ -51,6 +51,8 @@ Public Class usrCntlMitarbeiter
|
||||
ElseIf TabControl1.SelectedIndex = 6 Then
|
||||
showVERAGATILLA("VERIMEX")
|
||||
ElseIf TabControl1.SelectedIndex = 7 Then
|
||||
showVERAGATILLA("DURMAZ")
|
||||
ElseIf TabControl1.SelectedIndex = 8 Then
|
||||
If dgvTimasNew IsNot Nothing Then
|
||||
showTIMAS(False)
|
||||
End If
|
||||
@@ -198,6 +200,22 @@ Public Class usrCntlMitarbeiter
|
||||
'AL: Sortierung nach Ausfahrt (Zeit)
|
||||
dgvVERIMEX.Sort(dgvVERIMEX.Columns(3), ListSortDirection.Ascending)
|
||||
|
||||
End If
|
||||
ElseIf firma = "DURMAZ" Then
|
||||
' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql)
|
||||
|
||||
dgvDURMAZ.SET_SQL(sql, "ADMIN")
|
||||
dgvDURMAZ.LOAD()
|
||||
|
||||
'Tabelle Kommt/Geht bereinigen
|
||||
If dgvDURMAZ.RowCount = 0 Then
|
||||
dgvDURMAZ.DataSource = Nothing
|
||||
Else
|
||||
sortDGV(dgvDURMAZ)
|
||||
'Eintraege_festlegen()
|
||||
'AL: Sortierung nach Ausfahrt (Zeit)
|
||||
dgvDURMAZ.Sort(dgvDURMAZ.Columns(3), ListSortDirection.Ascending)
|
||||
|
||||
End If
|
||||
End If
|
||||
|
||||
@@ -327,6 +345,7 @@ Public Class usrCntlMitarbeiter
|
||||
Case 4 : Firma = "AMBAR"
|
||||
Case 5 : Firma = "FRONTOFFICE"
|
||||
Case 6 : Firma = "VERIMEX"
|
||||
Case 7 : Firma = "DURMAZ"
|
||||
End Select
|
||||
Dim frmMitarbDetails As New frmMitarbDetails(Firma)
|
||||
frmMitarbDetails.Show()
|
||||
@@ -390,13 +409,21 @@ Public Class usrCntlMitarbeiter
|
||||
Case vbNo
|
||||
|
||||
End Select
|
||||
ElseIf TabControl1.SelectedIndex = 5 Then
|
||||
ElseIf TabControl1.SelectedIndex = 6 Then
|
||||
Select Case MsgBox("Soll der Mitarbeiter '" & dgvVERIMEX.CurrentRow.Cells(1).Value & "' wirklich gelöscht werden?", vbQuestion Or vbYesNo Or vbDefaultButton2, "Löschen?")
|
||||
Case vbYes
|
||||
UID.delData(Convert.ToInt32(dgvVERIMEX.CurrentRow.Cells(0).Value))
|
||||
Tabelle_anzeigen()
|
||||
Case vbNo
|
||||
|
||||
End Select
|
||||
ElseIf TabControl1.SelectedIndex = 7 Then
|
||||
Select Case MsgBox("Soll der Mitarbeiter '" & dgvDURMAZ.CurrentRow.Cells(1).Value & "' wirklich gelöscht werden?", vbQuestion Or vbYesNo Or vbDefaultButton2, "Löschen?")
|
||||
Case vbYes
|
||||
UID.delData(Convert.ToInt32(dgvDURMAZ.CurrentRow.Cells(0).Value))
|
||||
Tabelle_anzeigen()
|
||||
Case vbNo
|
||||
|
||||
End Select
|
||||
End If
|
||||
|
||||
@@ -417,7 +444,7 @@ Public Class usrCntlMitarbeiter
|
||||
|
||||
|
||||
|
||||
Private Sub dgvIMEX_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvIMEX.CellDoubleClick, dgvUNISPED.CellDoubleClick, dgvAMBAR.CellDoubleClick, c.CellDoubleClick, dgvATILLA.CellDoubleClick, dgvFRONTOFFICE.CellDoubleClick, dgvVERIMEX.CellDoubleClick
|
||||
Private Sub dgvIMEX_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvIMEX.CellDoubleClick, dgvUNISPED.CellDoubleClick, dgvAMBAR.CellDoubleClick, c.CellDoubleClick, dgvATILLA.CellDoubleClick, dgvFRONTOFFICE.CellDoubleClick, dgvVERIMEX.CellDoubleClick, dgvDURMAZ.CellDoubleClick
|
||||
Me.Cursor = Cursors.Default
|
||||
Dim frmMitarbDetails As New frmMitarbDetails
|
||||
frmMitarbDetails.mid = sender.CurrentRow.Cells(0).Value
|
||||
@@ -446,7 +473,8 @@ Public Class usrCntlMitarbeiter
|
||||
Case 4 : dgv = dgvAMBAR
|
||||
Case 5 : dgv = dgvFRONTOFFICE
|
||||
Case 6 : dgv = dgvVERIMEX
|
||||
Case 7 : dgv = dgvTimasNew
|
||||
Case 7 : dgv = dgvDURMAZ
|
||||
Case 8 : dgv = dgvTimasNew
|
||||
End Select
|
||||
|
||||
If e.KeyCode = Keys.Return Then
|
||||
@@ -547,10 +575,21 @@ Public Class usrCntlMitarbeiter
|
||||
frm.Show(Me)
|
||||
End Select
|
||||
|
||||
ElseIf TabControl1.SelectedIndex = 7 Then
|
||||
|
||||
If dgvDURMAZ.SelectedRows.Count <> 1 Then Exit Sub
|
||||
Select Case sender.Name
|
||||
Case copyUserName
|
||||
copyUser(dgvDURMAZ.CurrentRow.Cells(0).Value)
|
||||
Case setPermissionsName
|
||||
Dim frm As New frmBenutzerBerGruppenKopieren(dgvDURMAZ.CurrentRow.Cells(0).Value)
|
||||
frm.Show(Me)
|
||||
End Select
|
||||
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub dgvVerag_CellMouseDown(ByVal sender As Object, ByVal e As DataGridViewCellMouseEventArgs) Handles c.CellMouseDown, dgvVERIMEX.CellMouseDown, dgvUNISPED.CellMouseDown, dgvIMEX.CellMouseDown, dgvFRONTOFFICE.CellMouseDown, dgvATILLA.CellMouseDown, dgvAMBAR.CellMouseDown
|
||||
Private Sub dgvVerag_CellMouseDown(ByVal sender As Object, ByVal e As DataGridViewCellMouseEventArgs) Handles c.CellMouseDown, dgvVERIMEX.CellMouseDown, dgvUNISPED.CellMouseDown, dgvIMEX.CellMouseDown, dgvFRONTOFFICE.CellMouseDown, dgvATILLA.CellMouseDown, dgvAMBAR.CellMouseDown, dgvDURMAZ.CellMouseDown
|
||||
|
||||
If e.Button = Windows.Forms.MouseButtons.Right AndAlso e.RowIndex > -1 Then
|
||||
Dim rowClicked As DataGridView.HitTestInfo
|
||||
@@ -587,9 +626,15 @@ Public Class usrCntlMitarbeiter
|
||||
|
||||
Case "dgvVERIMEX"
|
||||
|
||||
rowClicked = dgvAMBAR.HitTest(e.X, e.Y)
|
||||
dgvAMBAR.ClearSelection()
|
||||
Me.dgvAMBAR.Rows(e.RowIndex).Selected = True
|
||||
rowClicked = dgvVERIMEX.HitTest(e.X, e.Y)
|
||||
dgvVERIMEX.ClearSelection()
|
||||
Me.dgvVERIMEX.Rows(e.RowIndex).Selected = True
|
||||
|
||||
Case "dgvDURMAZ"
|
||||
|
||||
rowClicked = dgvDURMAZ.HitTest(e.X, e.Y)
|
||||
dgvDURMAZ.ClearSelection()
|
||||
Me.dgvDURMAZ.Rows(e.RowIndex).Selected = True
|
||||
|
||||
End Select
|
||||
|
||||
@@ -767,6 +812,10 @@ Public Class usrCntlMitarbeiter
|
||||
|
||||
dgv = dgvVERIMEX
|
||||
|
||||
ElseIf TabControl1.SelectedIndex = 7 Then
|
||||
|
||||
dgv = dgvDURMAZ
|
||||
|
||||
End If
|
||||
|
||||
Dim SQL As New SQL
|
||||
|
||||
Reference in New Issue
Block a user