merge

2026-05-04 15:36:37 +02:00
parent 5b38670a9d dc53bc10fa
commit 57fad2a763
7 changed files with 186 additions and 58 deletions
--- a/UID/Mitarbeiter/frmMitarbDetails.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.vb
@@ -174,6 +174,7 @@ Public Class frmMitarbDetails
        cboFirma.Items.Add("AMBAR")
        cboFirma.Items.Add("FRONTOFFICE")
        cboFirma.Items.Add("VERIMEX")
+        cboFirma.Items.Add("DURMAZ")
        cboFirma.Items.Add("ALLE")


@@ -185,6 +186,7 @@ Public Class frmMitarbDetails
        cboFirmaHaupt.Items.Add("AMBAR")
        cboFirmaHaupt.Items.Add("FRONTOFFICE")
        cboFirmaHaupt.Items.Add("VERIMEX")
+        cboFirmaHaupt.Items.Add("DURMAZ")


        cboFaktGrp.Items.Clear()
--- a/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb
+++ b/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb
@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class usrCntlMitarbeiter
    Inherits System.Windows.Forms.UserControl

    'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
        Try
            If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class usrCntlMitarbeiter
    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Me.Button6 = New System.Windows.Forms.Button()
@@ -60,6 +60,8 @@ Partial Class usrCntlMitarbeiter
        Me.BerechtigungenSetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.Button7 = New System.Windows.Forms.Button()
+        Me.TabPage9 = New System.Windows.Forms.TabPage()
+        Me.dgvDURMAZ = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Panel2.SuspendLayout()
        Me.TabControl1.SuspendLayout()
        Me.TabPage1.SuspendLayout()
@@ -81,6 +83,8 @@ Partial Class usrCntlMitarbeiter
        Me.Panel1.SuspendLayout()
        Me.Panel3.SuspendLayout()
        Me.ContextMenuStrip1.SuspendLayout()
+        Me.TabPage9.SuspendLayout()
+        CType(Me.dgvDURMAZ, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'Button6
@@ -160,6 +164,7 @@ Partial Class usrCntlMitarbeiter
        Me.TabControl1.Controls.Add(Me.TabPage5)
        Me.TabControl1.Controls.Add(Me.TabPage6)
        Me.TabControl1.Controls.Add(Me.TabPage7)
+        Me.TabControl1.Controls.Add(Me.TabPage9)
        Me.TabControl1.Controls.Add(Me.TabPage8)
        Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill
        Me.TabControl1.Location = New System.Drawing.Point(0, 0)
@@ -463,6 +468,27 @@ Partial Class usrCntlMitarbeiter
        Me.Button7.Text = "Check"
        Me.Button7.UseVisualStyleBackColor = True
        '
+        'TabPage9
+        '
+        Me.TabPage9.Controls.Add(Me.dgvDURMAZ)
+        Me.TabPage9.Location = New System.Drawing.Point(4, 22)
+        Me.TabPage9.Name = "TabPage9"
+        Me.TabPage9.Padding = New System.Windows.Forms.Padding(3)
+        Me.TabPage9.Size = New System.Drawing.Size(881, 622)
+        Me.TabPage9.TabIndex = 8
+        Me.TabPage9.Text = "DURMAZ"
+        Me.TabPage9.UseVisualStyleBackColor = True
+        '
+        'dgvDURMAZ
+        '
+        Me.dgvDURMAZ.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvDURMAZ.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvDURMAZ.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.dgvDURMAZ.Location = New System.Drawing.Point(3, 3)
+        Me.dgvDURMAZ.Name = "dgvDURMAZ"
+        Me.dgvDURMAZ.Size = New System.Drawing.Size(875, 616)
+        Me.dgvDURMAZ.TabIndex = 28
+        '
        'usrCntlMitarbeiter
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -495,6 +521,8 @@ Partial Class usrCntlMitarbeiter
        Me.Panel1.PerformLayout()
        Me.Panel3.ResumeLayout(False)
        Me.ContextMenuStrip1.ResumeLayout(False)
+        Me.TabPage9.ResumeLayout(False)
+        CType(Me.dgvDURMAZ, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)

    End Sub
@@ -534,5 +562,7 @@ Partial Class usrCntlMitarbeiter
    Friend WithEvents ContextMenuStrip2 As ContextMenuStrip
    Friend WithEvents cbxZE As CheckBox
    Friend WithEvents cbxDakosy As CheckBox
+    Friend WithEvents TabPage9 As TabPage
+    Friend WithEvents dgvDURMAZ As VERAG_PROG_ALLGEMEIN.MyDatagridview
    Friend WithEvents Button7 As Button
 End Class
--- a/UID/Mitarbeiter/usrCntlMitarbeiter.vb
+++ b/UID/Mitarbeiter/usrCntlMitarbeiter.vb
@@ -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