Timas und MitarbeiterID in Übersicht

2023-09-26 17:23:22 +02:00
parent 608dde3702
commit df4d816216
8 changed files with 69 additions and 35 deletions
--- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb
@@ -24,7 +24,6 @@ Partial Class frmMessenger
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
@@ -39,11 +38,11 @@ Partial Class frmMessenger
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger))
        Me.SplitContainer = New System.Windows.Forms.SplitContainer()
        Me.SplitContainer2 = New System.Windows.Forms.SplitContainer()
-        Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
        Me.Panel6 = New System.Windows.Forms.Panel()
        Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label()
        Me.cbxInaktiveChats = New System.Windows.Forms.CheckBox()
-        Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
        Me.Panel5 = New System.Windows.Forms.Panel()
        Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.PictureBox2 = New System.Windows.Forms.PictureBox()
@@ -64,7 +63,7 @@ Partial Class frmMessenger
        Me.btnNeu = New System.Windows.Forms.Button()
        Me.Button1 = New System.Windows.Forms.Button()
        Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
-        Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components)
+        Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel()
        Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement()
        Me.Panel3 = New System.Windows.Forms.Panel()
        Me.btnTeilnehmer = New System.Windows.Forms.Button()
@@ -91,9 +90,9 @@ Partial Class frmMessenger
        Me.btnSendAtt = New System.Windows.Forms.Button()
        Me.btnSenden = New System.Windows.Forms.Button()
        Me.rtbChatMessage = New System.Windows.Forms.RichTextBox()
-        Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer(Me.components)
-        Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components)
-        Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer()
+        Me.Timer_REFRESH = New System.Windows.Forms.Timer()
+        Me.cntxt = New System.Windows.Forms.ContextMenuStrip()
        Me.ChatDeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.toolChatReminder = New System.Windows.Forms.ToolStripMenuItem()
        Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb
@@ -31,6 +31,8 @@ Partial Class frmMitarbeitersuche
        Me.sbMitarbeiter = New VERAG_PROG_ALLGEMEIN.MySearchBox()
        Me.pnlMain = New System.Windows.Forms.Panel()
        Me.pnl = New System.Windows.Forms.Panel()
+        Me.lblMAId = New System.Windows.Forms.Label()
+        Me.Label5 = New System.Windows.Forms.Label()
        Me.btnSettings = New System.Windows.Forms.Button()
        Me.PictureBox9 = New System.Windows.Forms.PictureBox()
        Me.lblTimasSaldo = New System.Windows.Forms.Label()
@@ -59,6 +61,7 @@ Partial Class frmMitarbeitersuche
        Me.lblGeburtstag = New System.Windows.Forms.Label()
        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
        Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
+        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.lblPosition = New System.Windows.Forms.Label()
        Me.Label8 = New System.Windows.Forms.Label()
        Me.Label2 = New System.Windows.Forms.Label()
@@ -67,7 +70,6 @@ Partial Class frmMitarbeitersuche
        Me.lblFirma = New System.Windows.Forms.Label()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.Label3 = New System.Windows.Forms.Label()
-        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.pnlSrch.SuspendLayout()
        CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.pnlMain.SuspendLayout()
@@ -177,6 +179,8 @@ Partial Class frmMitarbeitersuche
        'pnl
        '
        Me.pnl.BackColor = System.Drawing.Color.FromArgb(CType(CType(250, Byte), Integer), CType(CType(254, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.pnl.Controls.Add(Me.lblMAId)
+        Me.pnl.Controls.Add(Me.Label5)
        Me.pnl.Controls.Add(Me.btnSettings)
        Me.pnl.Controls.Add(Me.PictureBox9)
        Me.pnl.Controls.Add(Me.lblTimasSaldo)
@@ -205,6 +209,28 @@ Partial Class frmMitarbeitersuche
        Me.pnl.Size = New System.Drawing.Size(774, 437)
        Me.pnl.TabIndex = 24
        '
+        'lblMAId
+        '
+        Me.lblMAId.AutoSize = True
+        Me.lblMAId.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.lblMAId.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblMAId.Location = New System.Drawing.Point(360, 95)
+        Me.lblMAId.Name = "lblMAId"
+        Me.lblMAId.Size = New System.Drawing.Size(59, 20)
+        Me.lblMAId.TabIndex = 122
+        Me.lblMAId.Text = "12345"
+        Me.lblMAId.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        '
+        'Label5
+        '
+        Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label5.Location = New System.Drawing.Point(210, 95)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(110, 20)
+        Me.Label5.TabIndex = 121
+        Me.Label5.Text = "Mitarbeiter-ID:"
+        Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        '
        'btnSettings
        '
        Me.btnSettings.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
@@ -288,7 +314,7 @@ Partial Class frmMitarbeitersuche
        'Panel4
        '
        Me.Panel4.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.Panel4.Location = New System.Drawing.Point(8, 93)
+        Me.Panel4.Location = New System.Drawing.Point(7, 89)
        Me.Panel4.Name = "Panel4"
        Me.Panel4.Size = New System.Drawing.Size(758, 1)
        Me.Panel4.TabIndex = 27
@@ -357,7 +383,7 @@ Partial Class frmMitarbeitersuche
        'Label1
        '
        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
-        Me.Label1.Location = New System.Drawing.Point(210, 153)
+        Me.Label1.Location = New System.Drawing.Point(207, 164)
        Me.Label1.Name = "Label1"
        Me.Label1.Size = New System.Drawing.Size(139, 25)
        Me.Label1.TabIndex = 21
@@ -377,9 +403,9 @@ Partial Class frmMitarbeitersuche
        'Label10
        '
        Me.Label10.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
-        Me.Label10.Location = New System.Drawing.Point(210, 102)
+        Me.Label10.Location = New System.Drawing.Point(210, 118)
        Me.Label10.Name = "Label10"
-        Me.Label10.Size = New System.Drawing.Size(139, 25)
+        Me.Label10.Size = New System.Drawing.Size(139, 21)
        Me.Label10.TabIndex = 15
        Me.Label10.Text = "E-Mail:"
        Me.Label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -397,7 +423,7 @@ Partial Class frmMitarbeitersuche
        'Label11
        '
        Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
-        Me.Label11.Location = New System.Drawing.Point(210, 127)
+        Me.Label11.Location = New System.Drawing.Point(210, 139)
        Me.Label11.Name = "Label11"
        Me.Label11.Size = New System.Drawing.Size(139, 25)
        Me.Label11.TabIndex = 14
@@ -407,7 +433,7 @@ Partial Class frmMitarbeitersuche
        'lblHandyNr
        '
        Me.lblHandyNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
-        Me.lblHandyNr.Location = New System.Drawing.Point(353, 153)
+        Me.lblHandyNr.Location = New System.Drawing.Point(350, 164)
        Me.lblHandyNr.Name = "lblHandyNr"
        Me.lblHandyNr.Size = New System.Drawing.Size(411, 25)
        Me.lblHandyNr.TabIndex = 22
@@ -418,7 +444,7 @@ Partial Class frmMitarbeitersuche
        '
        Me.lblMail.Cursor = System.Windows.Forms.Cursors.Hand
        Me.lblMail.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
-        Me.lblMail.Location = New System.Drawing.Point(353, 102)
+        Me.lblMail.Location = New System.Drawing.Point(360, 113)
        Me.lblMail.Name = "lblMail"
        Me.lblMail.Size = New System.Drawing.Size(411, 25)
        Me.lblMail.TabIndex = 17
@@ -428,7 +454,7 @@ Partial Class frmMitarbeitersuche
        'lblTelefon
        '
        Me.lblTelefon.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
-        Me.lblTelefon.Location = New System.Drawing.Point(353, 127)
+        Me.lblTelefon.Location = New System.Drawing.Point(350, 138)
        Me.lblTelefon.Name = "lblTelefon"
        Me.lblTelefon.Size = New System.Drawing.Size(411, 25)
        Me.lblTelefon.TabIndex = 16
@@ -479,6 +505,7 @@ Partial Class frmMitarbeitersuche
        'MyPanel1
        '
        Me.MyPanel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(250, Byte), Integer), CType(CType(254, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.MyPanel1.Controls.Add(Me.Panel1)
        Me.MyPanel1.Controls.Add(Me.lblPosition)
        Me.MyPanel1.Controls.Add(Me.Label8)
        Me.MyPanel1.Controls.Add(Me.Label2)
@@ -487,16 +514,24 @@ Partial Class frmMitarbeitersuche
        Me.MyPanel1.Controls.Add(Me.lblFirma)
        Me.MyPanel1.Controls.Add(Me.Label4)
        Me.MyPanel1.Controls.Add(Me.Label3)
-        Me.MyPanel1.Location = New System.Drawing.Point(197, 181)
+        Me.MyPanel1.Location = New System.Drawing.Point(197, 188)
        Me.MyPanel1.Name = "MyPanel1"
-        Me.MyPanel1.Size = New System.Drawing.Size(578, 116)
+        Me.MyPanel1.Size = New System.Drawing.Size(578, 109)
        Me.MyPanel1.TabIndex = 28
        '
+        'Panel1
+        '
+        Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Panel1.Location = New System.Drawing.Point(11, 1)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(553, 1)
+        Me.Panel1.TabIndex = 29
+        '
        'lblPosition
        '
        Me.lblPosition.BackColor = System.Drawing.Color.Transparent
        Me.lblPosition.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
-        Me.lblPosition.Location = New System.Drawing.Point(158, 87)
+        Me.lblPosition.Location = New System.Drawing.Point(158, 80)
        Me.lblPosition.Name = "lblPosition"
        Me.lblPosition.Size = New System.Drawing.Size(411, 25)
        Me.lblPosition.TabIndex = 10
@@ -506,7 +541,7 @@ Partial Class frmMitarbeitersuche
        '
        Me.Label8.BackColor = System.Drawing.Color.Transparent
        Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
-        Me.Label8.Location = New System.Drawing.Point(13, 87)
+        Me.Label8.Location = New System.Drawing.Point(13, 80)
        Me.Label8.Name = "Label8"
        Me.Label8.Size = New System.Drawing.Size(139, 25)
        Me.Label8.TabIndex = 9
@@ -580,21 +615,12 @@ Partial Class frmMitarbeitersuche
        Me.Label3.Text = "Niederlassung:"
        Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        '
-        'Panel1
-        '
-        Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.Panel1.Location = New System.Drawing.Point(214, 230)
-        Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(553, 1)
-        Me.Panel1.TabIndex = 29
-        '
        'frmMitarbeitersuche
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.WhiteSmoke
        Me.ClientSize = New System.Drawing.Size(776, 487)
-        Me.Controls.Add(Me.Panel1)
        Me.Controls.Add(Me.pnlMain)
        Me.Controls.Add(Me.pnlSrch)
        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
@@ -607,6 +633,7 @@ Partial Class frmMitarbeitersuche
        CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
        Me.pnlMain.ResumeLayout(False)
        Me.pnl.ResumeLayout(False)
+        Me.pnl.PerformLayout()
        CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit()
        Me.pnlWohnadresse.ResumeLayout(False)
        CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit()
@@ -665,4 +692,6 @@ Partial Class frmMitarbeitersuche
    Friend WithEvents lblTimasZeiten As Windows.Forms.Label
    Friend WithEvents lblTimasSaldo As Windows.Forms.Label
    Friend WithEvents PictureBox9 As Windows.Forms.PictureBox
+    Friend WithEvents lblMAId As Windows.Forms.Label
+    Friend WithEvents Label5 As Windows.Forms.Label
 End Class
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
@@ -85,6 +85,7 @@ Public Class frmMitarbeitersuche
            lblSpitzname.Text = If(MA.mit_MAVerzeichnis_Spitzname, "")
            lblFirma.Text = MA.getFirma
            lblNiederlassung.Text = If(MA.mit_niederlassung, "")
+            lblMAId.Text = MA.mit_id

            lblTelefon.Text = If(MA.mit_durchwahl, "")
            lblMail.Text = If(MA.mit_email, "")
@@ -190,6 +191,7 @@ Public Class frmMitarbeitersuche
    Sub clearMA()

        lblName.Text = ""
+        lblMAId.Text = ""
        lblSpitzname.Text = ""
        lblFirma.Text = ""
        lblNiederlassung.Text = ""
@@ -453,4 +455,6 @@ Public Class frmMitarbeitersuche
            setBGPic("", MA)
        End If
    End Sub
+
+
 End Class
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
@@ -928,7 +928,7 @@ Public Class cTimasEmployee

    Public ID As Integer
    Public externid As String
-    Public pnr1 As String
+    Public pnr1 As String 'ID für Lohnprogramm
    Public pnr2 As String
    Public firstname As String
    Public lastname As String