diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb
index 05585073..173a9ba1 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb
@@ -390,8 +390,8 @@ Public Class cMitarbeiter
If Not dr.Item("mit_fakturierungsgruppe") Is DBNull.Value Then Me.mit_fakturierungsgruppe = dr.Item("mit_fakturierungsgruppe")
If Not dr.Item("mit_CSuser") Is DBNull.Value Then Me.mit_CSuser = dr.Item("mit_CSuser")
If Not dr.Item("mit_CSpwd") Is DBNull.Value Then Me.mit_CSpwd = dr.Item("mit_CSpwd")
- If Not dr.Item("mit_PersonalNr") Is DBNull.Value Then Me.mit_PersonalNr = dr.Item("mit_PersonalNr")
- If Not dr.Item("mit_timasId") Is DBNull.Value Then Me.mit_timasId = dr.Item("mit_timasId")
+ If dr.Item("mit_PersonalNr") IsNot DBNull.Value Then Me.mit_PersonalNr = dr.Item("mit_PersonalNr")
+ If dr.Item("mit_timasId") IsNot DBNull.Value Then Me.mit_timasId = dr.Item("mit_timasId")
If Not dr.Item("mit_ATGRNAccessCode_AT51FP7") Is DBNull.Value Then Me.mit_ATGRNAccessCode_AT51FP7 = dr.Item("mit_ATGRNAccessCode_AT51FP7")
If Not dr.Item("mit_ATGRNAccessCode_AT52VA6") Is DBNull.Value Then Me.mit_ATGRNAccessCode_AT52VA6 = dr.Item("mit_ATGRNAccessCode_AT52VA6")
If Not dr.Item("mit_Sprachkentnisse") Is DBNull.Value Then Me.mit_Sprachkentnisse = dr.Item("mit_Sprachkentnisse")
diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb
index 7f1c0244..a8104d03 100644
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb
@@ -28,14 +28,21 @@ Partial Class frmMitarbeitersuche
Me.Button4 = New System.Windows.Forms.Button()
Me.btnClose = New System.Windows.Forms.Button()
Me.PictureBox2 = New System.Windows.Forms.PictureBox()
+ Me.sbMitarbeiter = New VERAG_PROG_ALLGEMEIN.MySearchBox()
Me.pnlMain = New System.Windows.Forms.Panel()
Me.pnl = New System.Windows.Forms.Panel()
+ Me.Panel2 = New System.Windows.Forms.Panel()
+ Me.lblStatusZE = New System.Windows.Forms.Label()
+ Me.Label13 = New System.Windows.Forms.Label()
Me.pnlZeiten = New System.Windows.Forms.Panel()
+ Me.Button2 = New System.Windows.Forms.Button()
+ Me.Label12 = New System.Windows.Forms.Label()
+ Me.Label9 = New System.Windows.Forms.Label()
Me.Button1 = New System.Windows.Forms.Button()
- Me.cbxHomeoffice = New System.Windows.Forms.CheckBox()
Me.btnZEGehen = New System.Windows.Forms.Button()
Me.btnZEKommen = New System.Windows.Forms.Button()
Me.lblTimasSaldo = New System.Windows.Forms.Label()
+ Me.cbxHomeoffice = New System.Windows.Forms.CheckBox()
Me.lblMAId = New System.Windows.Forms.Label()
Me.Label5 = New System.Windows.Forms.Label()
Me.btnSettings = New System.Windows.Forms.Button()
@@ -63,11 +70,6 @@ Partial Class frmMitarbeitersuche
Me.pnlGeburtstag = New System.Windows.Forms.Panel()
Me.lblGeburtstag = New System.Windows.Forms.Label()
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
- Me.Label9 = New System.Windows.Forms.Label()
- Me.Label12 = New System.Windows.Forms.Label()
- Me.Panel2 = New System.Windows.Forms.Panel()
- Me.Label13 = New System.Windows.Forms.Label()
- Me.lblStatusZE = New System.Windows.Forms.Label()
Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
Me.Panel1 = New System.Windows.Forms.Panel()
Me.lblPosition = New System.Windows.Forms.Label()
@@ -78,11 +80,11 @@ 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.sbMitarbeiter = New VERAG_PROG_ALLGEMEIN.MySearchBox()
Me.pnlSrch.SuspendLayout()
CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.pnlMain.SuspendLayout()
Me.pnl.SuspendLayout()
+ Me.Panel2.SuspendLayout()
Me.pnlZeiten.SuspendLayout()
Me.pnlWohnadresse.SuspendLayout()
CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -91,7 +93,6 @@ Partial Class frmMitarbeitersuche
CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
Me.pnlGeburtstag.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.Panel2.SuspendLayout()
Me.MyPanel1.SuspendLayout()
Me.SuspendLayout()
'
@@ -150,6 +151,32 @@ Partial Class frmMitarbeitersuche
Me.PictureBox2.TabIndex = 18
Me.PictureBox2.TabStop = False
'
+ 'sbMitarbeiter
+ '
+ Me.sbMitarbeiter._allowFreitext = False
+ Me.sbMitarbeiter._AllowSetValue = False
+ Me.sbMitarbeiter._allowSpaceAsSplitter = True
+ Me.sbMitarbeiter._autoSizeGross = False
+ Me.sbMitarbeiter._hideIfListEmpty = True
+ Me.sbMitarbeiter._value = Nothing
+ Me.sbMitarbeiter.conn_art = "FMZOLL"
+ Me.sbMitarbeiter.dgvpos = "LEFT"
+ Me.sbMitarbeiter.DISPLAY_PARAM = Nothing
+ Me.sbMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!)
+ Me.sbMitarbeiter.INVISIBLE_COLUMNS = Nothing
+ Me.sbMitarbeiter.key_visible = False
+ Me.sbMitarbeiter.KEYPARAM = Nothing
+ Me.sbMitarbeiter.Location = New System.Drawing.Point(45, 11)
+ Me.sbMitarbeiter.Name = "sbMitarbeiter"
+ Me.sbMitarbeiter.searchActive = True
+ Me.sbMitarbeiter.Size = New System.Drawing.Size(582, 29)
+ Me.sbMitarbeiter.SQL_ORDER_BY = Nothing
+ Me.sbMitarbeiter.SQL_SELECT = Nothing
+ Me.sbMitarbeiter.SQL_WHERE = Nothing
+ Me.sbMitarbeiter.SQL_WhereParamList = Nothing
+ Me.sbMitarbeiter.TabIndex = 0
+ Me.sbMitarbeiter.usrcntl = Nothing
+ '
'pnlMain
'
Me.pnlMain.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
@@ -195,11 +222,48 @@ Partial Class frmMitarbeitersuche
Me.pnl.Size = New System.Drawing.Size(774, 480)
Me.pnl.TabIndex = 24
'
+ 'Panel2
+ '
+ Me.Panel2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.Panel2.BackColor = System.Drawing.Color.Cornsilk
+ Me.Panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.Panel2.Controls.Add(Me.lblStatusZE)
+ Me.Panel2.Controls.Add(Me.Label13)
+ Me.Panel2.Location = New System.Drawing.Point(590, 402)
+ Me.Panel2.Name = "Panel2"
+ Me.Panel2.Size = New System.Drawing.Size(185, 66)
+ Me.Panel2.TabIndex = 128
+ '
+ 'lblStatusZE
+ '
+ Me.lblStatusZE.BackColor = System.Drawing.Color.Firebrick
+ Me.lblStatusZE.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
+ Me.lblStatusZE.ForeColor = System.Drawing.Color.White
+ Me.lblStatusZE.Location = New System.Drawing.Point(7, 17)
+ Me.lblStatusZE.Name = "lblStatusZE"
+ Me.lblStatusZE.Size = New System.Drawing.Size(174, 25)
+ Me.lblStatusZE.TabIndex = 12
+ Me.lblStatusZE.Text = "OFFLINE"
+ Me.lblStatusZE.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+ '
+ 'Label13
+ '
+ Me.Label13.AutoSize = True
+ Me.Label13.BackColor = System.Drawing.Color.Transparent
+ Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Underline)
+ Me.Label13.Location = New System.Drawing.Point(7, 2)
+ Me.Label13.Name = "Label13"
+ Me.Label13.Size = New System.Drawing.Size(113, 13)
+ Me.Label13.TabIndex = 128
+ Me.Label13.Text = "Status (Zeiterfassung):"
+ Me.Label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+ '
'pnlZeiten
'
Me.pnlZeiten.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.pnlZeiten.BackColor = System.Drawing.Color.Cornsilk
Me.pnlZeiten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.pnlZeiten.Controls.Add(Me.Button2)
Me.pnlZeiten.Controls.Add(Me.Label12)
Me.pnlZeiten.Controls.Add(Me.Label9)
Me.pnlZeiten.Controls.Add(Me.Button1)
@@ -212,6 +276,46 @@ Partial Class frmMitarbeitersuche
Me.pnlZeiten.Size = New System.Drawing.Size(591, 66)
Me.pnlZeiten.TabIndex = 22
'
+ 'Button2
+ '
+ Me.Button2.BackColor = System.Drawing.Color.White
+ Me.Button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.Button2.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.parcel_small1
+ Me.Button2.ImageAlign = System.Drawing.ContentAlignment.TopLeft
+ Me.Button2.Location = New System.Drawing.Point(257, 16)
+ Me.Button2.Name = "Button2"
+ Me.Button2.Size = New System.Drawing.Size(90, 46)
+ Me.Button2.TabIndex = 128
+ Me.Button2.Text = "POST"
+ Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+ Me.Button2.UseVisualStyleBackColor = False
+ Me.Button2.Visible = False
+ '
+ 'Label12
+ '
+ Me.Label12.AutoSize = True
+ Me.Label12.BackColor = System.Drawing.Color.Transparent
+ Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Underline)
+ Me.Label12.Location = New System.Drawing.Point(145, 2)
+ Me.Label12.Name = "Label12"
+ Me.Label12.Size = New System.Drawing.Size(117, 13)
+ Me.Label12.TabIndex = 127
+ Me.Label12.Text = "Saldo (letzte Buchung):"
+ Me.Label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+ '
+ 'Label9
+ '
+ Me.Label9.AutoSize = True
+ Me.Label9.BackColor = System.Drawing.Color.Transparent
+ Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Underline)
+ Me.Label9.Location = New System.Drawing.Point(10, 2)
+ Me.Label9.Name = "Label9"
+ Me.Label9.Size = New System.Drawing.Size(71, 13)
+ Me.Label9.TabIndex = 30
+ Me.Label9.Text = "Zeiterfassung"
+ Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+ '
'Button1
'
Me.Button1.BackColor = System.Drawing.Color.White
@@ -227,17 +331,6 @@ Partial Class frmMitarbeitersuche
Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button1.UseVisualStyleBackColor = False
'
- 'cbxHomeoffice
- '
- Me.cbxHomeoffice.AutoSize = True
- Me.cbxHomeoffice.ForeColor = System.Drawing.Color.Black
- Me.cbxHomeoffice.Location = New System.Drawing.Point(351, 1)
- Me.cbxHomeoffice.Name = "cbxHomeoffice"
- Me.cbxHomeoffice.Size = New System.Drawing.Size(80, 17)
- Me.cbxHomeoffice.TabIndex = 125
- Me.cbxHomeoffice.Text = "Homeoffice"
- Me.cbxHomeoffice.UseVisualStyleBackColor = True
- '
'btnZEGehen
'
Me.btnZEGehen.BackColor = System.Drawing.Color.White
@@ -273,9 +366,20 @@ Partial Class frmMitarbeitersuche
Me.lblTimasSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
Me.lblTimasSaldo.Location = New System.Drawing.Point(148, 21)
Me.lblTimasSaldo.Name = "lblTimasSaldo"
- Me.lblTimasSaldo.Size = New System.Drawing.Size(198, 24)
+ Me.lblTimasSaldo.Size = New System.Drawing.Size(103, 24)
Me.lblTimasSaldo.TabIndex = 30
'
+ 'cbxHomeoffice
+ '
+ Me.cbxHomeoffice.AutoSize = True
+ Me.cbxHomeoffice.ForeColor = System.Drawing.Color.Black
+ Me.cbxHomeoffice.Location = New System.Drawing.Point(351, 1)
+ Me.cbxHomeoffice.Name = "cbxHomeoffice"
+ Me.cbxHomeoffice.Size = New System.Drawing.Size(80, 17)
+ Me.cbxHomeoffice.TabIndex = 125
+ Me.cbxHomeoffice.Text = "Homeoffice"
+ Me.cbxHomeoffice.UseVisualStyleBackColor = True
+ '
'lblMAId
'
Me.lblMAId.AutoSize = True
@@ -550,66 +654,6 @@ Partial Class frmMitarbeitersuche
Me.PictureBox1.TabIndex = 13
Me.PictureBox1.TabStop = False
'
- 'Label9
- '
- Me.Label9.AutoSize = True
- Me.Label9.BackColor = System.Drawing.Color.Transparent
- Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Underline)
- Me.Label9.Location = New System.Drawing.Point(10, 2)
- Me.Label9.Name = "Label9"
- Me.Label9.Size = New System.Drawing.Size(71, 13)
- Me.Label9.TabIndex = 30
- Me.Label9.Text = "Zeiterfassung"
- Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
- '
- 'Label12
- '
- Me.Label12.AutoSize = True
- Me.Label12.BackColor = System.Drawing.Color.Transparent
- Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Underline)
- Me.Label12.Location = New System.Drawing.Point(145, 2)
- Me.Label12.Name = "Label12"
- Me.Label12.Size = New System.Drawing.Size(117, 13)
- Me.Label12.TabIndex = 127
- Me.Label12.Text = "Saldo (letzte Buchung):"
- Me.Label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
- '
- 'Panel2
- '
- Me.Panel2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.Panel2.BackColor = System.Drawing.Color.Cornsilk
- Me.Panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.Panel2.Controls.Add(Me.lblStatusZE)
- Me.Panel2.Controls.Add(Me.Label13)
- Me.Panel2.Location = New System.Drawing.Point(590, 402)
- Me.Panel2.Name = "Panel2"
- Me.Panel2.Size = New System.Drawing.Size(185, 66)
- Me.Panel2.TabIndex = 128
- '
- 'Label13
- '
- Me.Label13.AutoSize = True
- Me.Label13.BackColor = System.Drawing.Color.Transparent
- Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Underline)
- Me.Label13.Location = New System.Drawing.Point(7, 2)
- Me.Label13.Name = "Label13"
- Me.Label13.Size = New System.Drawing.Size(113, 13)
- Me.Label13.TabIndex = 128
- Me.Label13.Text = "Status (Zeiterfassung):"
- Me.Label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
- '
- 'lblStatusZE
- '
- Me.lblStatusZE.BackColor = System.Drawing.Color.Firebrick
- Me.lblStatusZE.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
- Me.lblStatusZE.ForeColor = System.Drawing.Color.White
- Me.lblStatusZE.Location = New System.Drawing.Point(7, 17)
- Me.lblStatusZE.Name = "lblStatusZE"
- Me.lblStatusZE.Size = New System.Drawing.Size(174, 25)
- Me.lblStatusZE.TabIndex = 12
- Me.lblStatusZE.Text = "OFFLINE"
- Me.lblStatusZE.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
- '
'MyPanel1
'
Me.MyPanel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(250, Byte), Integer), CType(CType(254, Byte), Integer), CType(CType(255, Byte), Integer))
@@ -723,32 +767,6 @@ Partial Class frmMitarbeitersuche
Me.Label3.Text = "Niederlassung:"
Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
- 'sbMitarbeiter
- '
- Me.sbMitarbeiter._allowFreitext = False
- Me.sbMitarbeiter._AllowSetValue = False
- Me.sbMitarbeiter._allowSpaceAsSplitter = True
- Me.sbMitarbeiter._autoSizeGross = False
- Me.sbMitarbeiter._hideIfListEmpty = True
- Me.sbMitarbeiter._value = Nothing
- Me.sbMitarbeiter.conn_art = "FMZOLL"
- Me.sbMitarbeiter.dgvpos = "LEFT"
- Me.sbMitarbeiter.DISPLAY_PARAM = Nothing
- Me.sbMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!)
- Me.sbMitarbeiter.INVISIBLE_COLUMNS = Nothing
- Me.sbMitarbeiter.key_visible = False
- Me.sbMitarbeiter.KEYPARAM = Nothing
- Me.sbMitarbeiter.Location = New System.Drawing.Point(45, 11)
- Me.sbMitarbeiter.Name = "sbMitarbeiter"
- Me.sbMitarbeiter.searchActive = True
- Me.sbMitarbeiter.Size = New System.Drawing.Size(582, 29)
- Me.sbMitarbeiter.SQL_ORDER_BY = Nothing
- Me.sbMitarbeiter.SQL_SELECT = Nothing
- Me.sbMitarbeiter.SQL_WHERE = Nothing
- Me.sbMitarbeiter.SQL_WhereParamList = Nothing
- Me.sbMitarbeiter.TabIndex = 0
- Me.sbMitarbeiter.usrcntl = Nothing
- '
'frmMitarbeitersuche
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -769,6 +787,8 @@ Partial Class frmMitarbeitersuche
Me.pnlMain.ResumeLayout(False)
Me.pnl.ResumeLayout(False)
Me.pnl.PerformLayout()
+ Me.Panel2.ResumeLayout(False)
+ Me.Panel2.PerformLayout()
Me.pnlZeiten.ResumeLayout(False)
Me.pnlZeiten.PerformLayout()
Me.pnlWohnadresse.ResumeLayout(False)
@@ -779,8 +799,6 @@ Partial Class frmMitarbeitersuche
Me.pnlGeburtstag.ResumeLayout(False)
Me.pnlGeburtstag.PerformLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
- Me.Panel2.ResumeLayout(False)
- Me.Panel2.PerformLayout()
Me.MyPanel1.ResumeLayout(False)
Me.ResumeLayout(False)
@@ -841,4 +859,5 @@ Partial Class frmMitarbeitersuche
Friend WithEvents Panel2 As Windows.Forms.Panel
Friend WithEvents lblStatusZE As Windows.Forms.Label
Friend WithEvents Label13 As Windows.Forms.Label
+ Friend WithEvents Button2 As Windows.Forms.Button
End Class
diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
index 1d8f1d3f..fcad8aa8 100644
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
@@ -183,6 +183,12 @@ Public Class frmMitarbeitersuche
End If
End If
+
+ If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZE_POSTGANG", "SDL") Then
+ Button2.Visible = True
+ End If
+
+
End If
End Sub
@@ -292,17 +298,47 @@ Public Class frmMitarbeitersuche
End If
End Sub
- Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles btnZEKommen.Click, btnZEGehen.Click
+ Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles btnZEKommen.Click, btnZEGehen.Click, Button2.Click
Dim art As String
If sender Is btnZEKommen Then
art = "in"
- Else
+ ElseIf sender Is btnZEGehen Then
art = "out"
+ Else
+ art = "post"
End If
+
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then
Dim timas As New cTimasAPI
- Dim a As MsgBoxResult = MsgBox(IIf(cbxHomeoffice.Checked, "Homeoffice", "Büro") & vbNewLine & sender.text & " für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & vbNewLine & Now.ToString(), vbYesNo)
+
+ If art = "post" Then
+ 'postgang ausstempen, dann beginn post, + 1h ende post
+ Dim askPost As MsgBoxResult = MsgBox("Postgang (1h) für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " eintragen?" & vbNewLine & Now.ToString(), vbYesNo)
+ If askPost = vbYes Then
+ Dim info
+ Dim timestp = Now
+
+ Dim timeEntryExisting As Boolean = False
+ Dim isOnline = timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, Nothing, timeEntryExisting)
+
+ If timeEntryExisting AndAlso isOnline Then timas.setTimeEntry(cAllgemein.MITARBEITER, timestp, info, "out", 0) 'Ende
+
+ timestp = timestp.AddMinutes(1)
+ timas.setTimeEntry(cAllgemein.MITARBEITER, timestp, info, "in", 6) 'Start Post 6 Postgang
+ timestp = timestp.AddHours(1)
+ timas.setTimeEntry(cAllgemein.MITARBEITER, timestp, info, "out", 6) ' Ende Post 6 Postgang
+ MsgBox(info)
+ Thread.Sleep(2000) 'warten bis Eintrag in Timas-DB
+ requestDone = False
+ initTimasSaldo()
+ End If
+
+
+ Else
+
+ 'normales kommen/gehen
+ Dim a As MsgBoxResult = MsgBox(IIf(cbxHomeoffice.Checked, "Homeoffice", "Büro") & vbNewLine & sender.text & " für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & vbNewLine & Now.ToString(), vbYesNo)
If a = vbYes Then
Dim info
timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, art, IIf(cbxHomeoffice.Checked, 3, 0))
@@ -312,6 +348,9 @@ Public Class frmMitarbeitersuche
initTimasSaldo()
End If
End If
+
+ End If
+
End Sub
@@ -330,36 +369,49 @@ Public Class frmMitarbeitersuche
If timas IsNot Nothing Then
timas.getTimeSaldo(MA.mit_timasId, lblTimasSaldo.Text)
lblStatusZE.Visible = True
- If timas.getTimeEntries(MA.mit_timasId, dtZeiten, requestDone) Then
- 'PictureBox9.Image = VERAG_PROG_ALLGEMEIN.My.Resources.Resources.uhr_green
- lblStatusZE.BackColor = Color.Green
- lblStatusZE.Text = "ONLINE"
+ Dim checkEntry As Boolean = timas.getTimeEntries(MA.mit_timasId, dtZeiten, requestDone)
- btnZEGehen.Enabled = True
- btnZEKommen.Enabled = False
+ If requestDone Then
+ If checkEntry Then
+ 'PictureBox9.Image = VERAG_PROG_ALLGEMEIN.My.Resources.Resources.uhr_green
+ lblStatusZE.BackColor = Color.Green
+ lblStatusZE.Text = "ONLINE"
+
+ btnZEGehen.Enabled = True
+ btnZEKommen.Enabled = False
+ Else
+ ' PictureBox9.Image = VERAG_PROG_ALLGEMEIN.My.Resources.Resources.uhr_red
+ lblStatusZE.Text = "OFFLINE"
+ lblStatusZE.BackColor = Color.Firebrick
+
+ btnZEGehen.Enabled = False
+ btnZEKommen.Enabled = True
+ End If
Else
- ' PictureBox9.Image = VERAG_PROG_ALLGEMEIN.My.Resources.Resources.uhr_red
- lblStatusZE.Text = "OFFLINE"
- lblStatusZE.BackColor = Color.Firebrick
-
+ 'Request wurde nicht verarbeitet -> Verbindungsfehler
+ lblStatusZE.Text = "Verbindungsfehler"
+ lblStatusZE.BackColor = Color.Gray
btnZEGehen.Enabled = False
- btnZEKommen.Enabled = True
+ btnZEKommen.Enabled = False
+
End If
+
If dtZeiten.Rows.Count > 0 AndAlso VERAG_PROG_ALLGEMEIN.cAllgemein.USRID = MA.mit_id Then
- pnlZeiten.Visible = True
- Else
- pnlZeiten.Visible = False
+ pnlZeiten.Visible = True
+ Else
+ pnlZeiten.Visible = False
+ End If
+
End If
End If
- End If
-
End Sub
Private Sub Button1_Click_2(sender As Object, e As EventArgs) Handles Button1.Click
Dim webAddress As String = "https://zeit.verag.ag/webterminal/"
Process.Start(webAddress)
End Sub
+
End Class
\ No newline at end of file
diff --git a/VERAG_PROG_ALLGEMEIN/My Project/Resources.Designer.vb b/VERAG_PROG_ALLGEMEIN/My Project/Resources.Designer.vb
index 9173a066..dd881a88 100644
--- a/VERAG_PROG_ALLGEMEIN/My Project/Resources.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/My Project/Resources.Designer.vb
@@ -220,6 +220,16 @@ Namespace My.Resources
End Get
End Property
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ '''
+ Friend ReadOnly Property parcel_small1() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("parcel_small1", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
'''
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''
diff --git a/VERAG_PROG_ALLGEMEIN/My Project/Resources.resx b/VERAG_PROG_ALLGEMEIN/My Project/Resources.resx
index 69a5fe26..90c889b6 100644
--- a/VERAG_PROG_ALLGEMEIN/My Project/Resources.resx
+++ b/VERAG_PROG_ALLGEMEIN/My Project/Resources.resx
@@ -142,6 +142,10 @@
..\Resources\today.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\zeiterfassung_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
..\Resources\seal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -178,14 +182,14 @@
..\Resources\pfeil_unten.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\people.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\Unisped_logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\männlich.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\pfeil_unten.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -792,9 +796,15 @@
Fy9uXn75Zbv0yOsRACAqTOz/AQDTq+UV1OGCAAAAAElFTkSuQmCC
+
+ ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\ok.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\uhr_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\picboxRotateRight_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -851,7 +861,7 @@
XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
- 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEgAACxIB0t1+/AAA9UFJREFUeF7s/QmYZNld
+ 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAA9UFJREFUeF7s/QmYZNld
nomHultbSy01EpbagISaEmJraGQQi5DYbBpJ7HiMwTPGbmMe/DfGM5jHeDyMZzDW2EaAV+FhbIyFWYVY
1GAQFkJIIEtdudSelVWZWZVZuVXua+VSXV0d/++7HbcUGX0yKzMj4t5zbrzv87xPRp6M5d577jn392VE
3Fur1+uIiIiIiIiIxzbYiIiIiIiIiHhYg42IiIiIiIiIhzXYiIiIiIiIiHhYg42IiIiIiIiIhzXYiIiI
@@ -1979,6 +1989,9 @@
..\Resources\picboxZoomIn_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\house.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\weiblich.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -1990,6 +2003,8 @@
..\Resources\zeiterfassung_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\person.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -2018,9 +2033,6 @@
..\Resources\fremdSped.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\easteregg.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -2039,8 +2051,8 @@
..\Resources\cake.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\uhr_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\männlich.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\Verag-Spedition-GMBH-Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -2054,6 +2066,8 @@
..\Resources\people.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\parcel_small1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\err.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
diff --git a/VERAG_PROG_ALLGEMEIN/Resources/parcel_small1.png b/VERAG_PROG_ALLGEMEIN/Resources/parcel_small1.png
new file mode 100644
index 00000000..fc430cb0
Binary files /dev/null and b/VERAG_PROG_ALLGEMEIN/Resources/parcel_small1.png differ
diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
index 1ce34a37..fc42a8e8 100644
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
@@ -805,7 +805,7 @@ Public Class cTimasAPI
Dim json As New Chilkat.JsonObject
json.UpdateString("stamp", timeEntry.ToString("yyyy-MM-ddTHH:mm:ss"))
- json.UpdateInt("statusnumber", art) '0 Standardanwesenheit, 3 Homeoffice
+ json.UpdateInt("statusnumber", art) '0 Standardanwesenheit, 3 Homeoffice, 6 Postgang
json.UpdateString("type", inout)
json.UpdateString("employeeid", mitarbeiter.mit_timasId)
diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
index 4b76c2ab..72e7f652 100644
--- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
+++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
@@ -374,6 +374,11 @@
Form
+
+ True
+ True
+ Resources.resx
+
@@ -565,11 +570,6 @@
True
Application.myapp
-
- True
- True
- Resources.resx
-
True
Settings.settings
@@ -762,9 +762,9 @@
VbMyResourcesResXFileCodeGenerator
- Resources.Designer.vb
My.Resources
Designer
+ Resources.Designer.vb
usrcntlKdSearch.vb
@@ -1336,6 +1336,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+