Merge branch 'ADMIN' of https://verag.visualstudio.com/ADMIN/_git/ADMIN into ADMIN

UID/Mitarbeiter/frmMitarbDetails.Designer.vb

@@ -81,7 +81,7 @@ Partial Class frmMitarbDetails
         Me.rtfInfoTimas = New System.Windows.Forms.RichTextBox()
         Me.btngetInfo = New System.Windows.Forms.Button()
         Me.cbxTimasAngelegt = New System.Windows.Forms.CheckBox()
-        Me.txtPersonalNr = New System.Windows.Forms.TextBox()
+        Me.txtLohnNr = New System.Windows.Forms.TextBox()
         Me.btnMAanlegen = New System.Windows.Forms.Button()
         Me.TabPage7 = New System.Windows.Forms.TabPage()
         Me.lbSprachen = New VERAG_PROG_ALLGEMEIN.MyListBox()
@@ -810,7 +810,7 @@ Partial Class frmMitarbDetails
         Me.TabPage6.Controls.Add(Me.rtfInfoTimas)
         Me.TabPage6.Controls.Add(Me.btngetInfo)
         Me.TabPage6.Controls.Add(Me.cbxTimasAngelegt)
-        Me.TabPage6.Controls.Add(Me.txtPersonalNr)
+        Me.TabPage6.Controls.Add(Me.txtLohnNr)
         Me.TabPage6.Controls.Add(Me.btnMAanlegen)
         Me.TabPage6.Location = New System.Drawing.Point(4, 22)
         Me.TabPage6.Name = "TabPage6"
@@ -878,13 +878,13 @@ Partial Class frmMitarbDetails
         Me.cbxTimasAngelegt.Text = "Account - PersonalNr (Lohnverr.)"
         Me.cbxTimasAngelegt.UseVisualStyleBackColor = True
         '
-        'txtPersonalNr
+        'txtLohnNr
         '
-        Me.txtPersonalNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtLohnNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPersonalNr.Location = New System.Drawing.Point(189, 3)
+        Me.txtLohnNr.Location = New System.Drawing.Point(189, 3)
-        Me.txtPersonalNr.Name = "txtPersonalNr"
+        Me.txtLohnNr.Name = "txtLohnNr"
-        Me.txtPersonalNr.Size = New System.Drawing.Size(47, 20)
+        Me.txtLohnNr.Size = New System.Drawing.Size(47, 20)
-        Me.txtPersonalNr.TabIndex = 114
+        Me.txtLohnNr.TabIndex = 114
         '
         'btnMAanlegen
         '
@@ -2472,7 +2472,7 @@ Partial Class frmMitarbDetails
     Friend WithEvents txtTelNr As TextBox
     Friend WithEvents TabPage6 As TabPage
     Friend WithEvents cbxTimasAngelegt As CheckBox
-    Friend WithEvents txtPersonalNr As TextBox
+    Friend WithEvents txtLohnNr As TextBox
     Friend WithEvents btnMAanlegen As Button
     Friend WithEvents btngetInfo As Button
     Friend WithEvents rtfInfoTimas As RichTextBox

UID/Mitarbeiter/frmMitarbDetails.vb

@@ -290,7 +290,7 @@ Public Class frmMitarbDetails
         txtTelotecSB.Text = mitarbeiter.mit_TELOTEC_SB
         txtCSUser.Text = mitarbeiter.mit_CSuser
         txtCSPW.Text = mitarbeiter.mit_CSpwd
-        txtPersonalNr.Text = mitarbeiter.mit_PersonalNr
+        txtLohnNr.Text = mitarbeiter.mit_PersonalNr
         txtTelNr.Text = mitarbeiter.mit_telefonnr
 
         cboALIASDomain.changeItem(mitarbeiter.mit_AliasAD_Domain)
@@ -583,7 +583,7 @@ Public Class frmMitarbDetails
         mitarbeiter.mit_teamId = If(cboTeam._value = "", Nothing, cboTeam._value)
         mitarbeiter.mit_CSuser = txtCSUser.Text
         mitarbeiter.mit_CSpwd = txtCSPW.Text
-        mitarbeiter.mit_PersonalNr = txtPersonalNr.Text
+        mitarbeiter.mit_PersonalNr = txtLohnNr.Text
         mitarbeiter.mit_telefonnr = txtTelNr.Text
 
 
@@ -902,7 +902,7 @@ Public Class frmMitarbDetails
 
 
             btnMAanlegen.Visible = Not cbxTimasAngelegt.Checked
-            txtPersonalNr.Enabled = Not cbxTimasAngelegt.Checked
+            txtLohnNr.Enabled = Not cbxTimasAngelegt.Checked
             dgvData.Visible = Not cbxTimasAngelegt.Checked
             TabControl1.Visible = Not cbxTimasAngelegt.Checked
             rtfInfoTimas.Visible = cbxTimasAngelegt.Checked
@@ -1173,7 +1173,7 @@ Public Class frmMitarbDetails
         If checkMandatoryFields() Then
             timas.createEmployee(mitarbeiter, rtfInfoTimas.Text, dtTimas)
             tbcntr_TabIndexChanged(sender, e)
-            End If
+        End If
 
     End Sub
 
@@ -1190,7 +1190,7 @@ Public Class frmMitarbDetails
     Private Sub cbxTimasAngelegt_CheckedChanged(sender As Object, e As EventArgs) Handles cbxTimasAngelegt.CheckedChanged
 
         btnMAanlegen.Visible = Not cbxTimasAngelegt.Checked
-        txtPersonalNr.Enabled = Not cbxTimasAngelegt.Checked
+        txtLohnNr.Enabled = Not cbxTimasAngelegt.Checked
         dgvData.Visible = Not cbxTimasAngelegt.Checked
         rtfInfoTimas.Visible = cbxTimasAngelegt.Checked
         btngetInfo.Visible = cbxTimasAngelegt.Checked

UID/Mitarbeiter/frmMitarbTimas.Designer.vb

@@ -33,6 +33,31 @@ Partial Class frmMitarbTimas
         Me.btnOK = New System.Windows.Forms.Button()
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+        Me.txtLohn = New System.Windows.Forms.TextBox()
+        Me.lblLohnNr = New System.Windows.Forms.Label()
+        Me.cbxAccount = New System.Windows.Forms.CheckBox()
+        Me.TextBox2 = New System.Windows.Forms.TextBox()
+        Me.Label7 = New System.Windows.Forms.Label()
+        Me.txtCard = New System.Windows.Forms.TextBox()
+        Me.lblCard = New System.Windows.Forms.Label()
+        Me.txtInfo = New System.Windows.Forms.TextBox()
+        Me.lblInfo = New System.Windows.Forms.Label()
+        Me.lkl = New System.Windows.Forms.LinkLabel()
+        Me.Label8 = New System.Windows.Forms.Label()
+        Me.txtPwd = New System.Windows.Forms.TextBox()
+        Me.Label6 = New System.Windows.Forms.Label()
+        Me.txtTelNr = New System.Windows.Forms.TextBox()
+        Me.cbxEinsteigsDat = New System.Windows.Forms.CheckBox()
+        Me.Label30 = New System.Windows.Forms.Label()
+        Me.datEinstiegsdatum = New System.Windows.Forms.DateTimePicker()
+        Me.datGekuendigtAm = New System.Windows.Forms.DateTimePicker()
+        Me.cbxGekuendigt = New System.Windows.Forms.CheckBox()
+        Me.txtEmail = New System.Windows.Forms.TextBox()
+        Me.Label20 = New System.Windows.Forms.Label()
+        Me.txtDurchwahl = New System.Windows.Forms.TextBox()
+        Me.Label19 = New System.Windows.Forms.Label()
+        Me.txtUsername = New System.Windows.Forms.TextBox()
+        Me.Label3 = New System.Windows.Forms.Label()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
         Me.cbxTestaccount = New System.Windows.Forms.CheckBox()
         Me.cbxGebDat = New System.Windows.Forms.CheckBox()
@@ -53,33 +78,8 @@ Partial Class frmMitarbTimas
         Me.txtVname = New System.Windows.Forms.TextBox()
         Me.Label2 = New System.Windows.Forms.Label()
         Me.GroupBox3 = New System.Windows.Forms.GroupBox()
-        Me.Label3 = New System.Windows.Forms.Label()
-        Me.txtUsername = New System.Windows.Forms.TextBox()
-        Me.Label19 = New System.Windows.Forms.Label()
-        Me.txtDurchwahl = New System.Windows.Forms.TextBox()
-        Me.Label20 = New System.Windows.Forms.Label()
-        Me.txtEmail = New System.Windows.Forms.TextBox()
-        Me.cbxGekuendigt = New System.Windows.Forms.CheckBox()
-        Me.datGekuendigtAm = New System.Windows.Forms.DateTimePicker()
-        Me.datEinstiegsdatum = New System.Windows.Forms.DateTimePicker()
-        Me.Label30 = New System.Windows.Forms.Label()
-        Me.cbxEinsteigsDat = New System.Windows.Forms.CheckBox()
-        Me.txtTelNr = New System.Windows.Forms.TextBox()
-        Me.Label6 = New System.Windows.Forms.Label()
-        Me.txtPwd = New System.Windows.Forms.TextBox()
-        Me.Label8 = New System.Windows.Forms.Label()
-        Me.lkl = New System.Windows.Forms.LinkLabel()
-        Me.lblInfo = New System.Windows.Forms.Label()
-        Me.txtInfo = New System.Windows.Forms.TextBox()
-        Me.lblCard = New System.Windows.Forms.Label()
-        Me.txtCard = New System.Windows.Forms.TextBox()
-        Me.Label7 = New System.Windows.Forms.Label()
-        Me.TextBox2 = New System.Windows.Forms.TextBox()
-        Me.cbxAccount = New System.Windows.Forms.CheckBox()
-        Me.lblLohnNr = New System.Windows.Forms.Label()
-        Me.txtLohn = New System.Windows.Forms.TextBox()
-        Me.TabControl1 = New System.Windows.Forms.TabControl()
         Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.TabControl1 = New System.Windows.Forms.TabControl()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         Me.GroupBox2.SuspendLayout()
@@ -146,6 +146,7 @@ Partial Class frmMitarbTimas
         '
         Me.btnCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.btnCancel.BackColor = System.Drawing.Color.White
+        Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
         Me.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnCancel.Location = New System.Drawing.Point(191, 871)
         Me.btnCancel.Name = "btnCancel"
@@ -158,6 +159,7 @@ Partial Class frmMitarbTimas
         '
         Me.btnOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.btnOK.BackColor = System.Drawing.Color.White
+        Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK
         Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnOK.Location = New System.Drawing.Point(12, 871)
         Me.btnOK.Name = "btnOK"
@@ -206,6 +208,240 @@ Partial Class frmMitarbTimas
         Me.GroupBox2.TabStop = False
         Me.GroupBox2.Text = "Timas - User"
         '
+        'txtLohn
+        '
+        Me.txtLohn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtLohn.Location = New System.Drawing.Point(207, 141)
+        Me.txtLohn.Name = "txtLohn"
+        Me.txtLohn.Size = New System.Drawing.Size(179, 20)
+        Me.txtLohn.TabIndex = 127
+        '
+        'lblLohnNr
+        '
+        Me.lblLohnNr.AutoSize = True
+        Me.lblLohnNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblLohnNr.Location = New System.Drawing.Point(204, 125)
+        Me.lblLohnNr.Name = "lblLohnNr"
+        Me.lblLohnNr.Size = New System.Drawing.Size(48, 13)
+        Me.lblLohnNr.TabIndex = 128
+        Me.lblLohnNr.Text = "Lohn-Nr:"
+        '
+        'cbxAccount
+        '
+        Me.cbxAccount.AutoSize = True
+        Me.cbxAccount.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxAccount.Location = New System.Drawing.Point(16, 19)
+        Me.cbxAccount.Name = "cbxAccount"
+        Me.cbxAccount.Size = New System.Drawing.Size(52, 17)
+        Me.cbxAccount.TabIndex = 126
+        Me.cbxAccount.Text = "Login"
+        Me.cbxAccount.UseVisualStyleBackColor = True
+        '
+        'TextBox2
+        '
+        Me.TextBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.TextBox2.Location = New System.Drawing.Point(16, 96)
+        Me.TextBox2.Name = "TextBox2"
+        Me.TextBox2.Size = New System.Drawing.Size(179, 20)
+        Me.TextBox2.TabIndex = 124
+        '
+        'Label7
+        '
+        Me.Label7.AutoSize = True
+        Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label7.Location = New System.Drawing.Point(13, 80)
+        Me.Label7.Name = "Label7"
+        Me.Label7.Size = New System.Drawing.Size(49, 13)
+        Me.Label7.TabIndex = 125
+        Me.Label7.Text = "RFID-Nr:"
+        '
+        'txtCard
+        '
+        Me.txtCard.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtCard.Location = New System.Drawing.Point(205, 96)
+        Me.txtCard.Name = "txtCard"
+        Me.txtCard.Size = New System.Drawing.Size(179, 20)
+        Me.txtCard.TabIndex = 122
+        '
+        'lblCard
+        '
+        Me.lblCard.AutoSize = True
+        Me.lblCard.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblCard.Location = New System.Drawing.Point(202, 80)
+        Me.lblCard.Name = "lblCard"
+        Me.lblCard.Size = New System.Drawing.Size(55, 13)
+        Me.lblCard.TabIndex = 123
+        Me.lblCard.Text = "Karten-Nr:"
+        '
+        'txtInfo
+        '
+        Me.txtInfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtInfo.Location = New System.Drawing.Point(16, 141)
+        Me.txtInfo.Name = "txtInfo"
+        Me.txtInfo.Size = New System.Drawing.Size(179, 20)
+        Me.txtInfo.TabIndex = 118
+        '
+        'lblInfo
+        '
+        Me.lblInfo.AutoSize = True
+        Me.lblInfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblInfo.Location = New System.Drawing.Point(13, 125)
+        Me.lblInfo.Name = "lblInfo"
+        Me.lblInfo.Size = New System.Drawing.Size(28, 13)
+        Me.lblInfo.TabIndex = 119
+        Me.lblInfo.Text = "Info:"
+        '
+        'lkl
+        '
+        Me.lkl.AutoSize = True
+        Me.lkl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lkl.Location = New System.Drawing.Point(347, 36)
+        Me.lkl.Name = "lkl"
+        Me.lkl.Size = New System.Drawing.Size(35, 13)
+        Me.lkl.TabIndex = 117
+        Me.lkl.TabStop = True
+        Me.lkl.Text = "Reset"
+        '
+        'Label8
+        '
+        Me.Label8.AutoSize = True
+        Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label8.Location = New System.Drawing.Point(206, 55)
+        Me.Label8.Name = "Label8"
+        Me.Label8.Size = New System.Drawing.Size(146, 13)
+        Me.Label8.TabIndex = 114
+        Me.Label8.Text = "(erst bei Doppelklick sichtbar)"
+        '
+        'txtPwd
+        '
+        Me.txtPwd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtPwd.Location = New System.Drawing.Point(204, 52)
+        Me.txtPwd.Name = "txtPwd"
+        Me.txtPwd.Size = New System.Drawing.Size(178, 20)
+        Me.txtPwd.TabIndex = 115
+        '
+        'Label6
+        '
+        Me.Label6.AutoSize = True
+        Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label6.Location = New System.Drawing.Point(202, 36)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(53, 13)
+        Me.Label6.TabIndex = 116
+        Me.Label6.Text = "Passwort:"
+        '
+        'txtTelNr
+        '
+        Me.txtTelNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtTelNr.Location = New System.Drawing.Point(18, 204)
+        Me.txtTelNr.Name = "txtTelNr"
+        Me.txtTelNr.Size = New System.Drawing.Size(114, 20)
+        Me.txtTelNr.TabIndex = 113
+        '
+        'cbxEinsteigsDat
+        '
+        Me.cbxEinsteigsDat.AutoSize = True
+        Me.cbxEinsteigsDat.Checked = True
+        Me.cbxEinsteigsDat.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxEinsteigsDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxEinsteigsDat.Location = New System.Drawing.Point(16, 238)
+        Me.cbxEinsteigsDat.Name = "cbxEinsteigsDat"
+        Me.cbxEinsteigsDat.Size = New System.Drawing.Size(15, 14)
+        Me.cbxEinsteigsDat.TabIndex = 90
+        Me.cbxEinsteigsDat.UseVisualStyleBackColor = True
+        '
+        'Label30
+        '
+        Me.Label30.AutoSize = True
+        Me.Label30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label30.Location = New System.Drawing.Point(31, 238)
+        Me.Label30.Name = "Label30"
+        Me.Label30.Size = New System.Drawing.Size(81, 13)
+        Me.Label30.TabIndex = 89
+        Me.Label30.Text = "Einstiegsdatum:"
+        '
+        'datEinstiegsdatum
+        '
+        Me.datEinstiegsdatum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.datEinstiegsdatum.Location = New System.Drawing.Point(118, 236)
+        Me.datEinstiegsdatum.Name = "datEinstiegsdatum"
+        Me.datEinstiegsdatum.Size = New System.Drawing.Size(200, 20)
+        Me.datEinstiegsdatum.TabIndex = 2
+        '
+        'datGekuendigtAm
+        '
+        Me.datGekuendigtAm.Enabled = False
+        Me.datGekuendigtAm.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.datGekuendigtAm.Location = New System.Drawing.Point(118, 259)
+        Me.datGekuendigtAm.Name = "datGekuendigtAm"
+        Me.datGekuendigtAm.Size = New System.Drawing.Size(200, 20)
+        Me.datGekuendigtAm.TabIndex = 9
+        '
+        'cbxGekuendigt
+        '
+        Me.cbxGekuendigt.AutoSize = True
+        Me.cbxGekuendigt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxGekuendigt.Location = New System.Drawing.Point(16, 262)
+        Me.cbxGekuendigt.Name = "cbxGekuendigt"
+        Me.cbxGekuendigt.Size = New System.Drawing.Size(69, 17)
+        Me.cbxGekuendigt.TabIndex = 8
+        Me.cbxGekuendigt.Text = "Ende DV"
+        Me.cbxGekuendigt.UseVisualStyleBackColor = True
+        '
+        'txtEmail
+        '
+        Me.txtEmail.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtEmail.Location = New System.Drawing.Point(210, 204)
+        Me.txtEmail.Name = "txtEmail"
+        Me.txtEmail.Size = New System.Drawing.Size(178, 20)
+        Me.txtEmail.TabIndex = 7
+        '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label20.Location = New System.Drawing.Point(207, 188)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(39, 13)
+        Me.Label20.TabIndex = 83
+        Me.Label20.Text = "E-Mail:"
+        '
+        'txtDurchwahl
+        '
+        Me.txtDurchwahl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtDurchwahl.Location = New System.Drawing.Point(138, 204)
+        Me.txtDurchwahl.Name = "txtDurchwahl"
+        Me.txtDurchwahl.Size = New System.Drawing.Size(54, 20)
+        Me.txtDurchwahl.TabIndex = 6
+        '
+        'Label19
+        '
+        Me.Label19.AutoSize = True
+        Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label19.Location = New System.Drawing.Point(15, 188)
+        Me.Label19.Name = "Label19"
+        Me.Label19.Size = New System.Drawing.Size(108, 13)
+        Me.Label19.TabIndex = 81
+        Me.Label19.Text = "Telefon / Durchwahl:"
+        '
+        'txtUsername
+        '
+        Me.txtUsername.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtUsername.Location = New System.Drawing.Point(16, 55)
+        Me.txtUsername.Name = "txtUsername"
+        Me.txtUsername.Size = New System.Drawing.Size(177, 20)
+        Me.txtUsername.TabIndex = 0
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label3.Location = New System.Drawing.Point(13, 39)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(58, 13)
+        Me.Label3.TabIndex = 56
+        Me.Label3.Text = "Username:"
+        '
         'GroupBox1
         '
         Me.GroupBox1.Controls.Add(Me.cbxTestaccount)
@@ -419,249 +655,6 @@ Partial Class frmMitarbTimas
         Me.GroupBox3.TabStop = False
         Me.GroupBox3.Text = "Timas - Gruppen"
         '
-        'Label3
-        '
-        Me.Label3.AutoSize = True
-        Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label3.Location = New System.Drawing.Point(13, 39)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(58, 13)
-        Me.Label3.TabIndex = 56
-        Me.Label3.Text = "Username:"
-        '
-        'txtUsername
-        '
-        Me.txtUsername.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtUsername.Location = New System.Drawing.Point(16, 55)
-        Me.txtUsername.Name = "txtUsername"
-        Me.txtUsername.Size = New System.Drawing.Size(177, 20)
-        Me.txtUsername.TabIndex = 0
-        '
-        'Label19
-        '
-        Me.Label19.AutoSize = True
-        Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label19.Location = New System.Drawing.Point(15, 188)
-        Me.Label19.Name = "Label19"
-        Me.Label19.Size = New System.Drawing.Size(108, 13)
-        Me.Label19.TabIndex = 81
-        Me.Label19.Text = "Telefon / Durchwahl:"
-        '
-        'txtDurchwahl
-        '
-        Me.txtDurchwahl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtDurchwahl.Location = New System.Drawing.Point(138, 204)
-        Me.txtDurchwahl.Name = "txtDurchwahl"
-        Me.txtDurchwahl.Size = New System.Drawing.Size(54, 20)
-        Me.txtDurchwahl.TabIndex = 6
-        '
-        'Label20
-        '
-        Me.Label20.AutoSize = True
-        Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label20.Location = New System.Drawing.Point(207, 188)
-        Me.Label20.Name = "Label20"
-        Me.Label20.Size = New System.Drawing.Size(39, 13)
-        Me.Label20.TabIndex = 83
-        Me.Label20.Text = "E-Mail:"
-        '
-        'txtEmail
-        '
-        Me.txtEmail.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtEmail.Location = New System.Drawing.Point(210, 204)
-        Me.txtEmail.Name = "txtEmail"
-        Me.txtEmail.Size = New System.Drawing.Size(178, 20)
-        Me.txtEmail.TabIndex = 7
-        '
-        'cbxGekuendigt
-        '
-        Me.cbxGekuendigt.AutoSize = True
-        Me.cbxGekuendigt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxGekuendigt.Location = New System.Drawing.Point(16, 262)
-        Me.cbxGekuendigt.Name = "cbxGekuendigt"
-        Me.cbxGekuendigt.Size = New System.Drawing.Size(69, 17)
-        Me.cbxGekuendigt.TabIndex = 8
-        Me.cbxGekuendigt.Text = "Ende DV"
-        Me.cbxGekuendigt.UseVisualStyleBackColor = True
-        '
-        'datGekuendigtAm
-        '
-        Me.datGekuendigtAm.Enabled = False
-        Me.datGekuendigtAm.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.datGekuendigtAm.Location = New System.Drawing.Point(118, 259)
-        Me.datGekuendigtAm.Name = "datGekuendigtAm"
-        Me.datGekuendigtAm.Size = New System.Drawing.Size(200, 20)
-        Me.datGekuendigtAm.TabIndex = 9
-        '
-        'datEinstiegsdatum
-        '
-        Me.datEinstiegsdatum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.datEinstiegsdatum.Location = New System.Drawing.Point(118, 236)
-        Me.datEinstiegsdatum.Name = "datEinstiegsdatum"
-        Me.datEinstiegsdatum.Size = New System.Drawing.Size(200, 20)
-        Me.datEinstiegsdatum.TabIndex = 2
-        '
-        'Label30
-        '
-        Me.Label30.AutoSize = True
-        Me.Label30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label30.Location = New System.Drawing.Point(31, 238)
-        Me.Label30.Name = "Label30"
-        Me.Label30.Size = New System.Drawing.Size(81, 13)
-        Me.Label30.TabIndex = 89
-        Me.Label30.Text = "Einstiegsdatum:"
-        '
-        'cbxEinsteigsDat
-        '
-        Me.cbxEinsteigsDat.AutoSize = True
-        Me.cbxEinsteigsDat.Checked = True
-        Me.cbxEinsteigsDat.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.cbxEinsteigsDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxEinsteigsDat.Location = New System.Drawing.Point(16, 238)
-        Me.cbxEinsteigsDat.Name = "cbxEinsteigsDat"
-        Me.cbxEinsteigsDat.Size = New System.Drawing.Size(15, 14)
-        Me.cbxEinsteigsDat.TabIndex = 90
-        Me.cbxEinsteigsDat.UseVisualStyleBackColor = True
-        '
-        'txtTelNr
-        '
-        Me.txtTelNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtTelNr.Location = New System.Drawing.Point(18, 204)
-        Me.txtTelNr.Name = "txtTelNr"
-        Me.txtTelNr.Size = New System.Drawing.Size(114, 20)
-        Me.txtTelNr.TabIndex = 113
-        '
-        'Label6
-        '
-        Me.Label6.AutoSize = True
-        Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label6.Location = New System.Drawing.Point(202, 36)
-        Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(53, 13)
-        Me.Label6.TabIndex = 116
-        Me.Label6.Text = "Passwort:"
-        '
-        'txtPwd
-        '
-        Me.txtPwd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPwd.Location = New System.Drawing.Point(204, 52)
-        Me.txtPwd.Name = "txtPwd"
-        Me.txtPwd.Size = New System.Drawing.Size(178, 20)
-        Me.txtPwd.TabIndex = 115
-        '
-        'Label8
-        '
-        Me.Label8.AutoSize = True
-        Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label8.Location = New System.Drawing.Point(206, 55)
-        Me.Label8.Name = "Label8"
-        Me.Label8.Size = New System.Drawing.Size(146, 13)
-        Me.Label8.TabIndex = 114
-        Me.Label8.Text = "(erst bei Doppelklick sichtbar)"
-        '
-        'lkl
-        '
-        Me.lkl.AutoSize = True
-        Me.lkl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lkl.Location = New System.Drawing.Point(347, 36)
-        Me.lkl.Name = "lkl"
-        Me.lkl.Size = New System.Drawing.Size(35, 13)
-        Me.lkl.TabIndex = 117
-        Me.lkl.TabStop = True
-        Me.lkl.Text = "Reset"
-        '
-        'lblInfo
-        '
-        Me.lblInfo.AutoSize = True
-        Me.lblInfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblInfo.Location = New System.Drawing.Point(13, 125)
-        Me.lblInfo.Name = "lblInfo"
-        Me.lblInfo.Size = New System.Drawing.Size(28, 13)
-        Me.lblInfo.TabIndex = 119
-        Me.lblInfo.Text = "Info:"
-        '
-        'txtInfo
-        '
-        Me.txtInfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtInfo.Location = New System.Drawing.Point(16, 141)
-        Me.txtInfo.Name = "txtInfo"
-        Me.txtInfo.Size = New System.Drawing.Size(179, 20)
-        Me.txtInfo.TabIndex = 118
-        '
-        'lblCard
-        '
-        Me.lblCard.AutoSize = True
-        Me.lblCard.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblCard.Location = New System.Drawing.Point(202, 80)
-        Me.lblCard.Name = "lblCard"
-        Me.lblCard.Size = New System.Drawing.Size(55, 13)
-        Me.lblCard.TabIndex = 123
-        Me.lblCard.Text = "Karten-Nr:"
-        '
-        'txtCard
-        '
-        Me.txtCard.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtCard.Location = New System.Drawing.Point(205, 96)
-        Me.txtCard.Name = "txtCard"
-        Me.txtCard.Size = New System.Drawing.Size(179, 20)
-        Me.txtCard.TabIndex = 122
-        '
-        'Label7
-        '
-        Me.Label7.AutoSize = True
-        Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label7.Location = New System.Drawing.Point(13, 80)
-        Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(49, 13)
-        Me.Label7.TabIndex = 125
-        Me.Label7.Text = "RFID-Nr:"
-        '
-        'TextBox2
-        '
-        Me.TextBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TextBox2.Location = New System.Drawing.Point(16, 96)
-        Me.TextBox2.Name = "TextBox2"
-        Me.TextBox2.Size = New System.Drawing.Size(179, 20)
-        Me.TextBox2.TabIndex = 124
-        '
-        'cbxAccount
-        '
-        Me.cbxAccount.AutoSize = True
-        Me.cbxAccount.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxAccount.Location = New System.Drawing.Point(16, 19)
-        Me.cbxAccount.Name = "cbxAccount"
-        Me.cbxAccount.Size = New System.Drawing.Size(52, 17)
-        Me.cbxAccount.TabIndex = 126
-        Me.cbxAccount.Text = "Login"
-        Me.cbxAccount.UseVisualStyleBackColor = True
-        '
-        'lblLohnNr
-        '
-        Me.lblLohnNr.AutoSize = True
-        Me.lblLohnNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblLohnNr.Location = New System.Drawing.Point(204, 125)
-        Me.lblLohnNr.Name = "lblLohnNr"
-        Me.lblLohnNr.Size = New System.Drawing.Size(48, 13)
-        Me.lblLohnNr.TabIndex = 128
-        Me.lblLohnNr.Text = "Lohn-Nr:"
-        '
-        'txtLohn
-        '
-        Me.txtLohn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtLohn.Location = New System.Drawing.Point(207, 141)
-        Me.txtLohn.Name = "txtLohn"
-        Me.txtLohn.Size = New System.Drawing.Size(179, 20)
-        Me.txtLohn.TabIndex = 127
-        '
-        'TabControl1
-        '
-        Me.TabControl1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TabControl1.Location = New System.Drawing.Point(6, 19)
-        Me.TabControl1.Name = "TabControl1"
-        Me.TabControl1.SelectedIndex = 0
-        Me.TabControl1.Size = New System.Drawing.Size(546, 242)
-        Me.TabControl1.TabIndex = 123
-        '
         'dgvData
         '
         Me.dgvData.AKTUALISIERUNGS_INTERVALL = -1
@@ -672,6 +665,15 @@ Partial Class frmMitarbTimas
         Me.dgvData.Size = New System.Drawing.Size(546, 242)
         Me.dgvData.TabIndex = 124
         '
+        'TabControl1
+        '
+        Me.TabControl1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.TabControl1.Location = New System.Drawing.Point(6, 19)
+        Me.TabControl1.Name = "TabControl1"
+        Me.TabControl1.SelectedIndex = 0
+        Me.TabControl1.Size = New System.Drawing.Size(546, 242)
+        Me.TabControl1.TabIndex = 123
+        '
         'frmMitarbTimas
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

UID/Mitarbeiter/frmMitarbTimas.vb

@@ -129,6 +129,7 @@ Public Class frmMitarbTimas
         If txtVname.Text = "" And txtNname.Text = "" Then MsgBox("Bitte geben Sie einen Namen ein!") : Exit Sub
         getMitarbeiter()
         Me.Refresh()
+        Me.Close()
 
     End Sub
 
@@ -145,11 +146,12 @@ Public Class frmMitarbTimas
         emp.street = txtStrasse.Text
         emp.zipcode = txtPlz.Text
         emp.street = txtOrt.Text
-
+        emp.pnr1 = txtLohn.Text
         emp.phone1 = txtTelNr.Text & " " & txtDurchwahl.Text
         emp.email = txtEmail.Text
         emp.phone2 = txtMobiltel.Text
         emp.info = txtInfo.Text
+        emp.card = txtCard.Text
 
 
         If cbxEinsteigsDat.Checked Then emp.entryDate = datEinstiegsdatum.Text Else emp.entryDate = "null"
@@ -159,6 +161,7 @@ Public Class frmMitarbTimas
         'mitarbeiter.mit_TESTonly = cbxTestaccount.Checked
         If checkMandatoryFields() Then
             timas.updateEmployee(emp, dgvData)
+
         End If
 
 

UID/Mitarbeiter/usrCntlMitarbeiter.vb

@@ -54,7 +54,7 @@ Public Class usrCntlMitarbeiter
             showVERAGATILLA("VERIMEX")
         ElseIf TabControl1.SelectedIndex = 7 Then
             If dgvTimasNew IsNot Nothing Then
-                showTIMAS()
+                showTIMAS(False)
             End If
         End If
 
@@ -193,11 +193,11 @@ Public Class usrCntlMitarbeiter
     End Sub
 
 
-    Public Sub showTIMAS()
+    Public Sub showTIMAS(refresh As Boolean)
         locZeilen = -1
         If Not Grid_aktiv Then Exit Sub
 
-        If dt.Columns.Count > 0 Then
+        If dt.Columns.Count > 0 And Not refresh Then
 
             If txtSuche.Text <> "" Then
                 dt.DefaultView.RowFilter = "Vorname like '%" & txtSuche.Text & "%'  or Nachname like '%" & txtSuche.Text & "%' or 'Personal-Nr (Lohn)' like '%" & txtSuche.Text & "%'  or Info like '%" & txtSuche.Text & "%'"
@@ -381,7 +381,7 @@ Public Class usrCntlMitarbeiter
 
 
     Private Sub dgvIMEX_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvIMEX.CellDoubleClick, dgvUNISPED.CellDoubleClick, dgvAMBAR.CellDoubleClick, dgvVERAG.CellDoubleClick, dgvATILLA.CellDoubleClick, dgvFRONTOFFICE.CellDoubleClick, dgvVERIMEX.CellDoubleClick
-        Me.Cursor = Cursors.WaitCursor
+        Me.Cursor = Cursors.Default
         Dim frmMitarbDetails As New frmMitarbDetails
         frmMitarbDetails.mid = sender.CurrentRow.Cells(0).Value
         frmMitarbDetails.Show(Me)
@@ -828,11 +828,18 @@ Public Class usrCntlMitarbeiter
     Private Sub dgvTimasNew_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvTimasNew.CellDoubleClick
         Me.Cursor = Cursors.WaitCursor
         'neue GUI für Änderungen im Timas
-
         Dim frmMitarbDetails As New frmMitarbTimas()
+
         frmMitarbDetails.mid = sender.CurrentRow.Cells(0).Value
-        frmMitarbDetails.Show(Me)
+        'frmMitarbDetails.Show(Me)
-        sender.RELOAD()
+        If frmMitarbDetails.ShowDialog() = DialogResult.OK Then
+            sender.RELOAD()
+            showTIMAS(True)
+            dgvTimasNew.Refresh()
+        End If
+
+       
+
         Me.Cursor = Cursors.Default
     End Sub
 End Class