creditsafe bugfix, abrechnungmaske (gu an CS oder AG), ZE-Buttons, Syska

2024-06-25 08:22:35 +02:00
parent 8841b1381c
commit 37bbc7d14f
10 changed files with 106 additions and 65 deletions
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
@@ -412,7 +412,7 @@ 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_nname.ToLower = "celan" Or MA.mit_nname.ToLower = "breimaier" Then 'aktuell Hardcoded, wenn Zeit ist dynamisch (per SQL-tbl)

                    Dim f As New frmZEButtons(art)
                    f.ShowDialog()
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmZEButtons.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmZEButtons.Designer.vb
@@ -65,7 +65,7 @@ Partial Class frmZEButtons
        Me.btnVergGehen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnVergGehen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_gehen
        Me.btnVergGehen.ImageAlign = System.Drawing.ContentAlignment.TopRight
-        Me.btnVergGehen.Location = New System.Drawing.Point(132, 168)
+        Me.btnVergGehen.Location = New System.Drawing.Point(132, 174)
        Me.btnVergGehen.Name = "btnVergGehen"
        Me.btnVergGehen.Size = New System.Drawing.Size(90, 45)
        Me.btnVergGehen.TabIndex = 132
@@ -82,7 +82,7 @@ Partial Class frmZEButtons
        Me.btnVergKommen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnVergKommen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_kommen
        Me.btnVergKommen.ImageAlign = System.Drawing.ContentAlignment.TopLeft
-        Me.btnVergKommen.Location = New System.Drawing.Point(20, 168)
+        Me.btnVergKommen.Location = New System.Drawing.Point(20, 174)
        Me.btnVergKommen.Name = "btnVergKommen"
        Me.btnVergKommen.Size = New System.Drawing.Size(106, 45)
        Me.btnVergKommen.TabIndex = 131
@@ -99,7 +99,7 @@ Partial Class frmZEButtons
        Me.btnFOGehen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnFOGehen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_gehen
        Me.btnFOGehen.ImageAlign = System.Drawing.ContentAlignment.TopRight
-        Me.btnFOGehen.Location = New System.Drawing.Point(132, 117)
+        Me.btnFOGehen.Location = New System.Drawing.Point(132, 123)
        Me.btnFOGehen.Name = "btnFOGehen"
        Me.btnFOGehen.Size = New System.Drawing.Size(90, 45)
        Me.btnFOGehen.TabIndex = 130
@@ -116,7 +116,7 @@ Partial Class frmZEButtons
        Me.btnFOKommen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnFOKommen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_kommen
        Me.btnFOKommen.ImageAlign = System.Drawing.ContentAlignment.TopLeft
-        Me.btnFOKommen.Location = New System.Drawing.Point(20, 117)
+        Me.btnFOKommen.Location = New System.Drawing.Point(20, 123)
        Me.btnFOKommen.Name = "btnFOKommen"
        Me.btnFOKommen.Size = New System.Drawing.Size(106, 45)
        Me.btnFOKommen.TabIndex = 129
@@ -128,7 +128,7 @@ Partial Class frmZEButtons
        '
        Me.Label1.AutoSize = True
        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label1.Location = New System.Drawing.Point(145, -1)
+        Me.Label1.Location = New System.Drawing.Point(145, 5)
        Me.Label1.Name = "Label1"
        Me.Label1.Size = New System.Drawing.Size(50, 13)
        Me.Label1.TabIndex = 128
@@ -138,7 +138,7 @@ Partial Class frmZEButtons
        '
        Me.lblkommen.AutoSize = True
        Me.lblkommen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblkommen.Location = New System.Drawing.Point(43, -1)
+        Me.lblkommen.Location = New System.Drawing.Point(43, 5)
        Me.lblkommen.Name = "lblkommen"
        Me.lblkommen.Size = New System.Drawing.Size(61, 13)
        Me.lblkommen.TabIndex = 127
@@ -153,7 +153,7 @@ Partial Class frmZEButtons
        Me.btnATTGehen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnATTGehen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_gehen
        Me.btnATTGehen.ImageAlign = System.Drawing.ContentAlignment.TopRight
-        Me.btnATTGehen.Location = New System.Drawing.Point(132, 66)
+        Me.btnATTGehen.Location = New System.Drawing.Point(132, 72)
        Me.btnATTGehen.Name = "btnATTGehen"
        Me.btnATTGehen.Size = New System.Drawing.Size(90, 45)
        Me.btnATTGehen.TabIndex = 126
@@ -170,7 +170,7 @@ Partial Class frmZEButtons
        Me.btnATTKommen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnATTKommen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_kommen
        Me.btnATTKommen.ImageAlign = System.Drawing.ContentAlignment.TopLeft
-        Me.btnATTKommen.Location = New System.Drawing.Point(20, 66)
+        Me.btnATTKommen.Location = New System.Drawing.Point(20, 72)
        Me.btnATTKommen.Name = "btnATTKommen"
        Me.btnATTKommen.Size = New System.Drawing.Size(106, 45)
        Me.btnATTKommen.TabIndex = 125
@@ -187,7 +187,7 @@ Partial Class frmZEButtons
        Me.btnIMEXGehen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnIMEXGehen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_gehen
        Me.btnIMEXGehen.ImageAlign = System.Drawing.ContentAlignment.TopRight
-        Me.btnIMEXGehen.Location = New System.Drawing.Point(132, 15)
+        Me.btnIMEXGehen.Location = New System.Drawing.Point(132, 21)
        Me.btnIMEXGehen.Name = "btnIMEXGehen"
        Me.btnIMEXGehen.Size = New System.Drawing.Size(90, 45)
        Me.btnIMEXGehen.TabIndex = 124
@@ -204,7 +204,7 @@ Partial Class frmZEButtons
        Me.btnIMEXKommen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnIMEXKommen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_kommen
        Me.btnIMEXKommen.ImageAlign = System.Drawing.ContentAlignment.TopLeft
-        Me.btnIMEXKommen.Location = New System.Drawing.Point(20, 15)
+        Me.btnIMEXKommen.Location = New System.Drawing.Point(20, 21)
        Me.btnIMEXKommen.Name = "btnIMEXKommen"
        Me.btnIMEXKommen.Size = New System.Drawing.Size(106, 45)
        Me.btnIMEXKommen.TabIndex = 123
@@ -217,10 +217,11 @@ Partial Class 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.ControlBox = False
        Me.Controls.Add(Me.pnlButtons)
+        Me.KeyPreview = True
        Me.Name = "frmZEButtons"
        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
-        Me.Text = "Zeiterfassung"
        Me.pnlButtons.ResumeLayout(False)
        Me.pnlButtons.PerformLayout()
        Me.ResumeLayout(False)
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmZEButtons.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmZEButtons.vb
@@ -1,4 +1,6 @@
-Public Class frmZEButtons
+Imports System.Windows.Forms
+
+Public Class frmZEButtons

    Dim art As String
    Public resultCode As Integer = -1
@@ -39,5 +41,12 @@

        End Select

+        Me.TopMost = True
+
+    End Sub
+
+
+    Private Sub frmZEButtons_KeyDown(sender As Object, e As KeyEventArgs) Handles MyBase.KeyDown
+        If e.KeyCode = Keys.Escape Then Me.Close()
    End Sub
 End Class