div. Änderungen

2024-09-19 13:14:44 +02:00
parent add7ac39a9
commit 3789fdec0e
44 changed files with 1181 additions and 878 deletions
--- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
@@ -125,10 +125,8 @@ Partial Class frmMitarbDetails
        Me.cboNiederlassung = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label9 = New System.Windows.Forms.Label()
        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
-        Me.cbxTimasNichtStempeln1 = New System.Windows.Forms.CheckBox()
        Me.txtprivateEMail = New System.Windows.Forms.TextBox()
        Me.Label64 = New System.Windows.Forms.Label()
-        Me.cbxHO = New System.Windows.Forms.CheckBox()
        Me.cbxChatBenutzer = New System.Windows.Forms.CheckBox()
        Me.cbxTestaccount = New System.Windows.Forms.CheckBox()
        Me.cbxGebDat = New System.Windows.Forms.CheckBox()
@@ -232,6 +230,9 @@ Partial Class frmMitarbDetails
        Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Label66 = New System.Windows.Forms.Label()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.cbxHO = New System.Windows.Forms.CheckBox()
+        Me.cbxBeiBeendenAusstempeln = New System.Windows.Forms.CheckBox()
+        Me.cbxTimasNichtStempeln1 = New System.Windows.Forms.CheckBox()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.TabControl2.SuspendLayout()
@@ -1394,10 +1395,8 @@ Partial Class frmMitarbDetails
        '
        'GroupBox1
        '
-        Me.GroupBox1.Controls.Add(Me.cbxTimasNichtStempeln1)
        Me.GroupBox1.Controls.Add(Me.txtprivateEMail)
        Me.GroupBox1.Controls.Add(Me.Label64)
-        Me.GroupBox1.Controls.Add(Me.cbxHO)
        Me.GroupBox1.Controls.Add(Me.cbxChatBenutzer)
        Me.GroupBox1.Controls.Add(Me.cbxTestaccount)
        Me.GroupBox1.Controls.Add(Me.cbxGebDat)
@@ -1433,17 +1432,6 @@ Partial Class frmMitarbDetails
        Me.GroupBox1.TabStop = False
        Me.GroupBox1.Text = "Person"
        '
-        'cbxTimasNichtStempeln1
-        '
-        Me.cbxTimasNichtStempeln1.AutoSize = True
-        Me.cbxTimasNichtStempeln1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxTimasNichtStempeln1.Location = New System.Drawing.Point(523, 182)
-        Me.cbxTimasNichtStempeln1.Name = "cbxTimasNichtStempeln1"
-        Me.cbxTimasNichtStempeln1.Size = New System.Drawing.Size(164, 17)
-        Me.cbxTimasNichtStempeln1.TabIndex = 97
-        Me.cbxTimasNichtStempeln1.Text = "Zeiterfassung: Kein Stempeln"
-        Me.cbxTimasNichtStempeln1.UseVisualStyleBackColor = True
-        '
        'txtprivateEMail
        '
        Me.txtprivateEMail.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -1462,17 +1450,6 @@ Partial Class frmMitarbDetails
        Me.Label64.TabIndex = 96
        Me.Label64.Text = "private EMail (für ZE-Daten):"
        '
-        'cbxHO
-        '
-        Me.cbxHO.AutoSize = True
-        Me.cbxHO.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxHO.Location = New System.Drawing.Point(295, 202)
-        Me.cbxHO.Name = "cbxHO"
-        Me.cbxHO.Size = New System.Drawing.Size(80, 17)
-        Me.cbxHO.TabIndex = 94
-        Me.cbxHO.Text = "Homeoffice"
-        Me.cbxHO.UseVisualStyleBackColor = True
-        '
        'cbxChatBenutzer
        '
        Me.cbxChatBenutzer.AutoSize = True
@@ -2253,6 +2230,9 @@ Partial Class frmMitarbDetails
        '
        'TabPage8
        '
+        Me.TabPage8.Controls.Add(Me.cbxTimasNichtStempeln1)
+        Me.TabPage8.Controls.Add(Me.cbxBeiBeendenAusstempeln)
+        Me.TabPage8.Controls.Add(Me.cbxHO)
        Me.TabPage8.Controls.Add(Me.Button7)
        Me.TabPage8.Controls.Add(Me.TabControl3)
        Me.TabPage8.Controls.Add(Me.rtfInfoTimas)
@@ -2589,6 +2569,39 @@ Partial Class frmMitarbDetails
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
        Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
        '
+        'cbxHO
+        '
+        Me.cbxHO.AutoSize = True
+        Me.cbxHO.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxHO.Location = New System.Drawing.Point(569, 9)
+        Me.cbxHO.Name = "cbxHO"
+        Me.cbxHO.Size = New System.Drawing.Size(80, 17)
+        Me.cbxHO.TabIndex = 151
+        Me.cbxHO.Text = "Homeoffice"
+        Me.cbxHO.UseVisualStyleBackColor = True
+        '
+        'cbxBeiBeendenAusstempeln
+        '
+        Me.cbxBeiBeendenAusstempeln.AutoSize = True
+        Me.cbxBeiBeendenAusstempeln.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxBeiBeendenAusstempeln.Location = New System.Drawing.Point(569, 32)
+        Me.cbxBeiBeendenAusstempeln.Name = "cbxBeiBeendenAusstempeln"
+        Me.cbxBeiBeendenAusstempeln.Size = New System.Drawing.Size(144, 17)
+        Me.cbxBeiBeendenAusstempeln.TabIndex = 152
+        Me.cbxBeiBeendenAusstempeln.Text = "Bei Beenden austempeln"
+        Me.cbxBeiBeendenAusstempeln.UseVisualStyleBackColor = True
+        '
+        'cbxTimasNichtStempeln1
+        '
+        Me.cbxTimasNichtStempeln1.AutoSize = True
+        Me.cbxTimasNichtStempeln1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxTimasNichtStempeln1.Location = New System.Drawing.Point(569, 55)
+        Me.cbxTimasNichtStempeln1.Name = "cbxTimasNichtStempeln1"
+        Me.cbxTimasNichtStempeln1.Size = New System.Drawing.Size(164, 17)
+        Me.cbxTimasNichtStempeln1.TabIndex = 153
+        Me.cbxTimasNichtStempeln1.Text = "Zeiterfassung: Kein Stempeln"
+        Me.cbxTimasNichtStempeln1.UseVisualStyleBackColor = True
+        '
        'frmMitarbDetails
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2812,10 +2825,8 @@ Partial Class frmMitarbDetails
    Friend WithEvents lbSprachen As VERAG_PROG_ALLGEMEIN.MyListBox
    Friend WithEvents Label62 As Label
    Friend WithEvents cboEZOLL_SB_UNISPED As VERAG_PROG_ALLGEMEIN.MyComboBox
-    Friend WithEvents cbxHO As CheckBox
    Friend WithEvents txtprivateEMail As TextBox
    Friend WithEvents Label64 As Label
-    Friend WithEvents cbxTimasNichtStempeln1 As CheckBox
    Friend WithEvents TabPage8 As TabPage
    Friend WithEvents Label68 As Label
    Friend WithEvents cbabwJahresurlaub As CheckBox
@@ -2846,4 +2857,7 @@ Partial Class frmMitarbDetails
    Friend WithEvents rtfInfoTimas As RichTextBox
    Friend WithEvents dgvData As VERAG_PROG_ALLGEMEIN.MyDatagridview
    Friend WithEvents Button7 As Button
+    Friend WithEvents cbxTimasNichtStempeln1 As CheckBox
+    Friend WithEvents cbxBeiBeendenAusstempeln As CheckBox
+    Friend WithEvents cbxHO As CheckBox
 End Class
--- a/UID/Mitarbeiter/frmMitarbDetails.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.vb
@@ -306,6 +306,7 @@ Public Class frmMitarbDetails

        cbxHO.Checked = mitarbeiter.mit_homeoffice
        cbxTimasNichtStempeln1.Checked = mitarbeiter.mit_timasNichtStempeln
+        cbxBeiBeendenAusstempeln.Checked = mitarbeiter.mit_ausstempelnBeiBeenden



@@ -581,6 +582,7 @@ Public Class frmMitarbDetails
        mitarbeiter.mit_PersonalNr = txtLohnNr.Text
        mitarbeiter.mit_telefonnr = txtTelNr.Text
        mitarbeiter.mit_homeoffice = cbxHO.Checked
+        mitarbeiter.mit_ausstempelnBeiBeenden = cbxBeiBeendenAusstempeln.Checked
        mitarbeiter.mit_timasNichtStempeln = cbxTimasNichtStempeln1.Checked
        mitarbeiter.mit_emailprivat = txtprivateEMail.Text

@@ -1426,7 +1428,7 @@ Public Class frmMitarbDetails


                Dim dtbereitsausgezahlteUE As DataTable
-                Dim bereitsgezahlteueberstunden = "select uest_date as Datum ,isnull(uest_100,0) as ÜS100 , isnull(uest_50,0) as ÜS50, isnull(uest_25,0) as ÜS25, isnull(uest_0,0) as ÜS50_Saldo, isnull(uest_paidout_sum,0) as ausbezahlt, uest_systemuser as eingetragen_von ,uest_created as eingetragen_am, cast (case when isnull([uest_ignorePayoutDate],0) = 0 then 0 else 1 end as bit) as ignoreAuszahlungsdatum
+                Dim bereitsgezahlteueberstunden = "select uest_date as Datum ,isnull(uest_100,0) as ÜS100 , isnull(uest_50,0) as ÜS50, isnull(uest_25,0) as ÜS25, isnull(uest_0,0) as ÜS50_Saldo, isnull(uest_paidout_sum,0) as ausbezahlt, uest_systemuser as eingetragen_von ,uest_created as eingetragen_am, cast (case when isnull([uest_ignorePayoutDate],0) = 0 then 0 else 1 end as bit) ignoreAuszahlungsdatum
                FROM [ADMIN].[dbo].[tblUeberstunden] 
                where uest_deleted = 0 and uest_maId = " & mitarbeiter.mit_id & "
                Order by uest_date"
@@ -1453,5 +1455,12 @@ Public Class frmMitarbDetails

    End Sub

+    Private Sub cbxBeiBeendenAusstempeln_CheckedChanged(sender As Object, e As EventArgs) Handles cbxBeiBeendenAusstempeln.CheckedChanged
+
+    End Sub
+
+    Private Sub cbxHO_CheckedChanged(sender As Object, e As EventArgs) Handles cbxHO.CheckedChanged
+
+    End Sub
 End Class

--- a/UID/Mitarbeiter/usrCntlMitarbeiter.vb
+++ b/UID/Mitarbeiter/usrCntlMitarbeiter.vb
@@ -290,7 +290,7 @@ Public Class usrCntlMitarbeiter
            .Columns("mit_gekuendigt").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter

            .Columns("mit_DAKOSY").Width = 100
-            .Columns("mit_DAKOSY").HeaderText = "Dakosy-Zugang"
+            .Columns("mit_DAKOSY").HeaderText = "DY-Zugang"
            .Columns("mit_DAKOSY").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight