ZE mehrere Firmen

2024-11-13 10:35:33 +01:00
parent 03e06bbb63
commit e3af2f2076
4 changed files with 58 additions and 19 deletions
--- a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb
@@ -95,6 +95,8 @@ Public Class cMitarbeiter
    Property mit_homeoffice As Boolean = False
    Property mit_timasNichtStempeln As Boolean = False
    Property mit_ausstempelnBeiBeenden As Boolean = False
+    Property mit_timasMehrereFirmen As Boolean = False
+    Property mit_timasFirmen As Object = Nothing


    Dim SQL As New SQL
@@ -206,6 +208,8 @@ Public Class cMitarbeiter
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_timasNichtStempeln", mit_timasNichtStempeln))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_emailprivat", mit_emailprivat))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_ausstempelnBeiBeenden", mit_ausstempelnBeiBeenden))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_timasFirmen", mit_timasFirmen))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_timasMehrereFirmen", mit_timasMehrereFirmen))



@@ -409,6 +413,8 @@ Public Class cMitarbeiter
                            Me.mit_timasNichtStempeln = dr.Item("mit_timasNichtStempeln")
                            If Not dr.Item("mit_emailprivat") Is DBNull.Value Then Me.mit_emailprivat = dr.Item("mit_emailprivat")
                            Me.mit_ausstempelnBeiBeenden = dr.Item("mit_ausstempelnBeiBeenden")
+                            If Not dr.Item("mit_timasFirmen") Is DBNull.Value Then Me.mit_timasFirmen = dr.Item("mit_timasFirmen")
+                            Me.mit_timasMehrereFirmen = dr.Item("mit_timasMehrereFirmen")


                        Catch ex As Exception
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
@@ -412,19 +412,9 @@ Public Class frmMitarbeitersuche

                Dim resultCode As Integer = IIf(cbxHomeoffice.Checked, 3, 0)

-                If MA.mit_nname.ToLower = "celan" Then 'aktuell Hardcoded, wenn Zeit ist dynamisch (per SQL-tbl)
+                If MA.mit_timasMehrereFirmen Then

-                    Dim f As New frmZEButtons(art, {"IMEX", "ATILLA", "VERAG", "FO"})
-                    f.ShowDialog()
-
-                    If f.DialogResult = DialogResult.OK AndAlso f.resultCode >= 0 Then
-                        resultCode = f.resultCode
-                    Else
-                        Exit Sub
-                    End If
-                ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_nname.ToLower = "arslan" AndAlso VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_vname.ToLower = "cihan" Then
-
-                    Dim f As New frmZEButtons(art, {"IMEX", "ATILLA"})
+                    Dim f As New frmZEButtons(art, MA.mit_timasFirmen)
                    f.ShowDialog()

                    If f.DialogResult = DialogResult.OK AndAlso f.resultCode >= 0 Then
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmZEButtons.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmZEButtons.Designer.vb
@@ -33,6 +33,8 @@ Partial Class frmZEButtons
        Me.btnATTKommen = New System.Windows.Forms.Button()
        Me.btnIMEXGehen = New System.Windows.Forms.Button()
        Me.btnIMEXKommen = New System.Windows.Forms.Button()
+        Me.btnABMARGehen = New System.Windows.Forms.Button()
+        Me.btnAMBARKommen = New System.Windows.Forms.Button()
        Me.pnlButtons.SuspendLayout()
        Me.SuspendLayout()
        '
@@ -41,6 +43,8 @@ Partial Class frmZEButtons
        Me.pnlButtons.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.pnlButtons.BackColor = System.Drawing.Color.Cornsilk
        Me.pnlButtons.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnlButtons.Controls.Add(Me.btnABMARGehen)
+        Me.pnlButtons.Controls.Add(Me.btnAMBARKommen)
        Me.pnlButtons.Controls.Add(Me.btnVergGehen)
        Me.pnlButtons.Controls.Add(Me.btnVergKommen)
        Me.pnlButtons.Controls.Add(Me.btnFOGehen)
@@ -51,9 +55,9 @@ Partial Class frmZEButtons
        Me.pnlButtons.Controls.Add(Me.btnATTKommen)
        Me.pnlButtons.Controls.Add(Me.btnIMEXGehen)
        Me.pnlButtons.Controls.Add(Me.btnIMEXKommen)
-        Me.pnlButtons.Location = New System.Drawing.Point(1, 1)
+        Me.pnlButtons.Location = New System.Drawing.Point(1, -2)
        Me.pnlButtons.Name = "pnlButtons"
-        Me.pnlButtons.Size = New System.Drawing.Size(235, 229)
+        Me.pnlButtons.Size = New System.Drawing.Size(235, 275)
        Me.pnlButtons.TabIndex = 23
        '
        'btnVergGehen
@@ -212,11 +216,45 @@ Partial Class frmZEButtons
        Me.btnIMEXKommen.TextAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.btnIMEXKommen.UseVisualStyleBackColor = False
        '
+        'btnABMARGehen
+        '
+        Me.btnABMARGehen.BackColor = System.Drawing.Color.White
+        Me.btnABMARGehen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btnABMARGehen.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.btnABMARGehen.Enabled = False
+        Me.btnABMARGehen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnABMARGehen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_gehen
+        Me.btnABMARGehen.ImageAlign = System.Drawing.ContentAlignment.TopRight
+        Me.btnABMARGehen.Location = New System.Drawing.Point(132, 225)
+        Me.btnABMARGehen.Name = "btnABMARGehen"
+        Me.btnABMARGehen.Size = New System.Drawing.Size(90, 45)
+        Me.btnABMARGehen.TabIndex = 134
+        Me.btnABMARGehen.Text = "AMBAR"
+        Me.btnABMARGehen.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnABMARGehen.UseVisualStyleBackColor = False
+        '
+        'btnAMBARKommen
+        '
+        Me.btnAMBARKommen.BackColor = System.Drawing.Color.White
+        Me.btnAMBARKommen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btnAMBARKommen.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.btnAMBARKommen.Enabled = False
+        Me.btnAMBARKommen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnAMBARKommen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_kommen
+        Me.btnAMBARKommen.ImageAlign = System.Drawing.ContentAlignment.TopLeft
+        Me.btnAMBARKommen.Location = New System.Drawing.Point(20, 225)
+        Me.btnAMBARKommen.Name = "btnAMBARKommen"
+        Me.btnAMBARKommen.Size = New System.Drawing.Size(106, 45)
+        Me.btnAMBARKommen.TabIndex = 133
+        Me.btnAMBARKommen.Text = "AMBAR"
+        Me.btnAMBARKommen.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnAMBARKommen.UseVisualStyleBackColor = False
+        '
        'frmZEButtons
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(236, 232)
+        Me.ClientSize = New System.Drawing.Size(236, 275)
        Me.ControlBox = False
        Me.Controls.Add(Me.pnlButtons)
        Me.KeyPreview = True
@@ -239,4 +277,6 @@ Partial Class frmZEButtons
    Friend WithEvents btnVergKommen As Windows.Forms.Button
    Friend WithEvents btnFOGehen As Windows.Forms.Button
    Friend WithEvents btnFOKommen As Windows.Forms.Button
+    Friend WithEvents btnABMARGehen As Windows.Forms.Button
+    Friend WithEvents btnAMBARKommen As Windows.Forms.Button
 End Class
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmZEButtons.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmZEButtons.vb
@@ -6,14 +6,13 @@ Public Class frmZEButtons
    Dim firma As String()
    Public resultCode As Integer = -1

-    Sub New(art As String, Firma As String())
+    Sub New(art As String, _Firma As String)
        Me.art = art
-        Me.firma = Firma
+        Me.firma = Split(_Firma, ",")
        InitializeComponent()
    End Sub

-
-    Private Sub btnZEKommen_Click(sender As Object, e As EventArgs) Handles btnIMEXKommen.Click, btnIMEXGehen.Click, btnATTGehen.Click, btnATTKommen.Click, btnVergGehen.Click, btnVergKommen.Click, btnFOGehen.Click, btnFOKommen.Click
+    Private Sub btnZEKommen_Click(sender As Object, e As EventArgs) Handles btnIMEXKommen.Click, btnIMEXGehen.Click, btnATTGehen.Click, btnATTKommen.Click, btnVergGehen.Click, btnVergKommen.Click, btnFOGehen.Click, btnFOKommen.Click, btnAMBARKommen.Click, btnAMBARKommen.Click
        Select Case sender.name
            Case "btnIMEXKommen" : resultCode = 19
            Case "btnIMEXGehen" : resultCode = 19
@@ -23,6 +22,8 @@ Public Class frmZEButtons
            Case "btnVergGehen" : resultCode = 0
            Case "btnFOKommen" : resultCode = 20
            Case "btnFOGehen" : resultCode = 20
+            Case "btnAMBARKommen" : resultCode = 23
+            Case "btnAMBAGehen" : resultCode = 23
        End Select
    End Sub

@@ -36,6 +37,7 @@ Public Class frmZEButtons
                    If firma.Contains("IMEX") Then btnIMEXKommen.Enabled = True
                    If firma.Contains("FO") Then btnFOKommen.Enabled = True
                    If firma.Contains("VERAG") Then btnVergKommen.Enabled = True
+                    If firma.Contains("AMBAR") Then btnAMBARKommen.Enabled = True

                End If

@@ -47,6 +49,7 @@ Public Class frmZEButtons
                    If firma.Contains("IMEX") Then btnIMEXGehen.Enabled = True
                    If firma.Contains("FO") Then btnFOGehen.Enabled = True
                    If firma.Contains("VERAG") Then btnVergGehen.Enabled = True
+                    If firma.Contains("AMBAR") Then btnABMARGehen.Enabled = True

                End If