From 1bbc91e993dd6b59b21ea7a7aa08c18a3046146d Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 26 Sep 2023 13:49:00 +0200 Subject: [PATCH] Timas Korrektur --- UID/Mitarbeiter/frmMitarbDetails.Designer.vb | 18 +++++++++--------- UID/Mitarbeiter/frmMitarbDetails.vb | 10 +++++----- UID/Mitarbeiter/frmMitarbTimas.vb | 3 ++- UID/Mitarbeiter/usrCntlMitarbeiter.vb | 2 +- UID/My Project/AssemblyInfo.vb | 4 ++-- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb index 4d0b5bc..b7323d7 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb +++ b/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.txtPersonalNr.Location = New System.Drawing.Point(189, 3) - Me.txtPersonalNr.Name = "txtPersonalNr" - Me.txtPersonalNr.Size = New System.Drawing.Size(47, 20) - Me.txtPersonalNr.TabIndex = 114 + Me.txtLohnNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtLohnNr.Location = New System.Drawing.Point(189, 3) + Me.txtLohnNr.Name = "txtLohnNr" + Me.txtLohnNr.Size = New System.Drawing.Size(47, 20) + 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 diff --git a/UID/Mitarbeiter/frmMitarbDetails.vb b/UID/Mitarbeiter/frmMitarbDetails.vb index 2fda113..75003ac 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.vb +++ b/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 diff --git a/UID/Mitarbeiter/frmMitarbTimas.vb b/UID/Mitarbeiter/frmMitarbTimas.vb index 6c6fb2d..27bbd54 100644 --- a/UID/Mitarbeiter/frmMitarbTimas.vb +++ b/UID/Mitarbeiter/frmMitarbTimas.vb @@ -145,11 +145,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" diff --git a/UID/Mitarbeiter/usrCntlMitarbeiter.vb b/UID/Mitarbeiter/usrCntlMitarbeiter.vb index d58fcd6..d551c4e 100644 --- a/UID/Mitarbeiter/usrCntlMitarbeiter.vb +++ b/UID/Mitarbeiter/usrCntlMitarbeiter.vb @@ -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) diff --git a/UID/My Project/AssemblyInfo.vb b/UID/My Project/AssemblyInfo.vb index 85a03c4..80164b6 100644 --- a/UID/My Project/AssemblyInfo.vb +++ b/UID/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + +