Spedi-Suche, timas-Aktengang, Bugfix Prüfung ZE-Eintrag

2023-11-22 13:52:17 +01:00
parent 0e2de41544
commit 792521238e
13 changed files with 266 additions and 104 deletions
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb
@@ -34,6 +34,8 @@ Partial Class frmMitarbeitersuche
        Me.lblStatusZE = New System.Windows.Forms.Label()
        Me.Label13 = New System.Windows.Forms.Label()
        Me.pnlZeiten = New System.Windows.Forms.Panel()
+        Me.btnAkten = New System.Windows.Forms.Button()
+        Me.PictureBox5 = New System.Windows.Forms.PictureBox()
        Me.Button2 = New System.Windows.Forms.Button()
        Me.Label12 = New System.Windows.Forms.Label()
        Me.Label9 = New System.Windows.Forms.Label()
@@ -86,6 +88,7 @@ Partial Class frmMitarbeitersuche
        Me.pnl.SuspendLayout()
        Me.Panel2.SuspendLayout()
        Me.pnlZeiten.SuspendLayout()
+        CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.pnlWohnadresse.SuspendLayout()
        CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.pnlMotto.SuspendLayout()
@@ -203,9 +206,9 @@ Partial Class frmMitarbeitersuche
        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.Location = New System.Drawing.Point(624, 402)
        Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(185, 66)
+        Me.Panel2.Size = New System.Drawing.Size(151, 66)
        Me.Panel2.TabIndex = 128
        '
        'lblStatusZE
@@ -215,7 +218,7 @@ Partial Class frmMitarbeitersuche
        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.Size = New System.Drawing.Size(140, 25)
        Me.lblStatusZE.TabIndex = 12
        Me.lblStatusZE.Text = "OFFLINE"
        Me.lblStatusZE.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -237,6 +240,8 @@ Partial Class frmMitarbeitersuche
        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.btnAkten)
+        Me.pnlZeiten.Controls.Add(Me.PictureBox5)
        Me.pnlZeiten.Controls.Add(Me.Button2)
        Me.pnlZeiten.Controls.Add(Me.Label12)
        Me.pnlZeiten.Controls.Add(Me.Label9)
@@ -247,9 +252,35 @@ Partial Class frmMitarbeitersuche
        Me.pnlZeiten.Controls.Add(Me.cbxHomeoffice)
        Me.pnlZeiten.Location = New System.Drawing.Point(0, 402)
        Me.pnlZeiten.Name = "pnlZeiten"
-        Me.pnlZeiten.Size = New System.Drawing.Size(591, 66)
+        Me.pnlZeiten.Size = New System.Drawing.Size(624, 66)
        Me.pnlZeiten.TabIndex = 22
        '
+        'btnAkten
+        '
+        Me.btnAkten.BackColor = System.Drawing.Color.White
+        Me.btnAkten.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btnAkten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnAkten.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.file_small
+        Me.btnAkten.ImageAlign = System.Drawing.ContentAlignment.TopLeft
+        Me.btnAkten.Location = New System.Drawing.Point(535, 15)
+        Me.btnAkten.Name = "btnAkten"
+        Me.btnAkten.Size = New System.Drawing.Size(85, 46)
+        Me.btnAkten.TabIndex = 130
+        Me.btnAkten.Text = " AKTEN"
+        Me.btnAkten.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnAkten.UseVisualStyleBackColor = False
+        Me.btnAkten.Visible = False
+        '
+        'PictureBox5
+        '
+        Me.PictureBox5.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.blue_question_mark_hi
+        Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.PictureBox5.Location = New System.Drawing.Point(86, 1)
+        Me.PictureBox5.Name = "PictureBox5"
+        Me.PictureBox5.Size = New System.Drawing.Size(18, 19)
+        Me.PictureBox5.TabIndex = 129
+        Me.PictureBox5.TabStop = False
+        '
        'Button2
        '
        Me.Button2.BackColor = System.Drawing.Color.White
@@ -257,9 +288,9 @@ Partial Class frmMitarbeitersuche
        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(495, 15)
+        Me.Button2.Location = New System.Drawing.Point(457, 15)
        Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(90, 46)
+        Me.Button2.Size = New System.Drawing.Size(77, 46)
        Me.Button2.TabIndex = 128
        Me.Button2.Text = "POST"
        Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -283,7 +314,7 @@ Partial Class frmMitarbeitersuche
        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.Location = New System.Drawing.Point(9, 2)
        Me.Label9.Name = "Label9"
        Me.Label9.Size = New System.Drawing.Size(71, 13)
        Me.Label9.TabIndex = 30
@@ -297,9 +328,9 @@ Partial Class frmMitarbeitersuche
        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button1.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.zeiterfassung_s
        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.TopLeft
-        Me.Button1.Location = New System.Drawing.Point(9, 17)
+        Me.Button1.Location = New System.Drawing.Point(12, 21)
        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(123, 45)
+        Me.Button1.Size = New System.Drawing.Size(120, 41)
        Me.Button1.TabIndex = 126
        Me.Button1.Text = "Zeiterfassung" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Online"
        Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -312,9 +343,9 @@ Partial Class frmMitarbeitersuche
        Me.btnZEGehen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnZEGehen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_gehen
        Me.btnZEGehen.ImageAlign = System.Drawing.ContentAlignment.TopRight
-        Me.btnZEGehen.Location = New System.Drawing.Point(382, 16)
+        Me.btnZEGehen.Location = New System.Drawing.Point(364, 16)
        Me.btnZEGehen.Name = "btnZEGehen"
-        Me.btnZEGehen.Size = New System.Drawing.Size(107, 45)
+        Me.btnZEGehen.Size = New System.Drawing.Size(90, 45)
        Me.btnZEGehen.TabIndex = 124
        Me.btnZEGehen.Text = "GEHEN"
        Me.btnZEGehen.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -327,7 +358,7 @@ Partial Class frmMitarbeitersuche
        Me.btnZEKommen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnZEKommen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_kommen
        Me.btnZEKommen.ImageAlign = System.Drawing.ContentAlignment.TopLeft
-        Me.btnZEKommen.Location = New System.Drawing.Point(270, 16)
+        Me.btnZEKommen.Location = New System.Drawing.Point(252, 16)
        Me.btnZEKommen.Name = "btnZEKommen"
        Me.btnZEKommen.Size = New System.Drawing.Size(106, 45)
        Me.btnZEKommen.TabIndex = 123
@@ -347,7 +378,7 @@ Partial Class frmMitarbeitersuche
        '
        Me.cbxHomeoffice.AutoSize = True
        Me.cbxHomeoffice.ForeColor = System.Drawing.Color.Black
-        Me.cbxHomeoffice.Location = New System.Drawing.Point(270, 1)
+        Me.cbxHomeoffice.Location = New System.Drawing.Point(255, 1)
        Me.cbxHomeoffice.Name = "cbxHomeoffice"
        Me.cbxHomeoffice.Size = New System.Drawing.Size(80, 17)
        Me.cbxHomeoffice.TabIndex = 125
@@ -791,6 +822,7 @@ Partial Class frmMitarbeitersuche
        Me.Panel2.PerformLayout()
        Me.pnlZeiten.ResumeLayout(False)
        Me.pnlZeiten.PerformLayout()
+        CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
        Me.pnlWohnadresse.ResumeLayout(False)
        CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit()
        Me.pnlMotto.ResumeLayout(False)
@@ -860,4 +892,6 @@ Partial Class frmMitarbeitersuche
    Friend WithEvents lblStatusZE As Windows.Forms.Label
    Friend WithEvents Label13 As Windows.Forms.Label
    Friend WithEvents Button2 As Windows.Forms.Button
+    Friend WithEvents PictureBox5 As Windows.Forms.PictureBox
+    Friend WithEvents btnAkten As Windows.Forms.Button
 End Class
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
@@ -1,4 +1,5 @@
 Imports System.ComponentModel
+Imports System.Diagnostics.Eventing.Reader
 Imports System.Drawing
 Imports System.Net
 Imports System.Threading
@@ -183,11 +184,9 @@ Public Class frmMitarbeitersuche
                End If
            End If

+            If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZE_POSTGANG", "SDL") Then Button2.Visible = True

-            If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZE_POSTGANG", "SDL") Then
-                Button2.Visible = True
-            End If
-
+            If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZE_AKTENGANG", "SDL") Then btnAkten.Visible = True

        End If
    End Sub
@@ -298,12 +297,14 @@ Public Class frmMitarbeitersuche
        End If
    End Sub

-    Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles btnZEKommen.Click, btnZEGehen.Click, Button2.Click
+    Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles btnZEKommen.Click, btnZEGehen.Click, Button2.Click, btnAkten.Click
        Dim art As String
        If sender Is btnZEKommen Then
            art = "in"
        ElseIf sender Is btnZEGehen Then
            art = "out"
+        ElseIf sender Is btnAkten Then
+            art = "akten"
        Else
            art = "post"
        End If
@@ -333,8 +334,31 @@ Public Class frmMitarbeitersuche
                    initTimasData()
                End If

+            ElseIf art = "akten" Then
+                Dim aktengang As DateTime = Now().AddMinutes(-10)
+                Dim askPost As MsgBoxResult = MsgBox("Aktengang für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " eintragen?" & vbNewLine & aktengang.ToString(), vbYesNo)
+                If askPost = vbYes Then
+                        Dim info
+                    Dim timestp = aktengang

-            Else
+                    Dim timeEntryExisting As Boolean = False
+                        Dim isOnline = timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, Nothing, timeEntryExisting)
+                    If Not timeEntryExisting AndAlso Not isOnline Then
+                        timas.setTimeEntry(cAllgemein.MITARBEITER, timestp, info, "in", 10) 'Start 10 Aktengang
+                        timestp = timestp.AddMinutes(10)
+                        timas.setTimeEntry(cAllgemein.MITARBEITER, timestp, info, "out", 10) 'Ende 10 Aktengang
+                        timestp = timestp.AddMinutes(1)
+                        timas.setTimeEntry(cAllgemein.MITARBEITER, timestp, info, "in", 0) ' Start
+                    End If
+
+                    MsgBox(info)
+                        Thread.Sleep(2000) 'warten bis Eintrag in Timas-DB
+                        requestDone = False
+                        initTimasData()
+                    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)
@@ -369,8 +393,9 @@ Public Class frmMitarbeitersuche
                Dim isServiceRunning As Boolean = True
                timas.getTimeSaldo(MA.mit_timasId, lblTimasSaldo.Text, isServiceRunning)
                If Not isServiceRunning Then
-                    MsgBox("Abfragefehler!")
-                    Exit Sub
+                    'Abfrage konnte nicht durchgeführt werden.
+                    MsgBox("Abfragefehler am Timas-Server!")
+                    'Exit Sub
                End If
                lblStatusZE.Visible = True
                Dim checkEntry As Boolean = timas.getTimeEntries(MA.mit_timasId, dtZeiten,, requestDone)
@@ -383,6 +408,7 @@ Public Class frmMitarbeitersuche

                        btnZEGehen.Enabled = True
                        btnZEKommen.Enabled = False
+                        btnAkten.Enabled = False
                    Else
                        '                    PictureBox9.Image = VERAG_PROG_ALLGEMEIN.My.Resources.Resources.uhr_red
                        lblStatusZE.Text = "OFFLINE"
@@ -390,13 +416,16 @@ Public Class frmMitarbeitersuche

                        btnZEGehen.Enabled = False
                        btnZEKommen.Enabled = True
+                        btnAkten.Enabled = True
                    End If
                Else
                    'Request wurde nicht verarbeitet -> Verbindungsfehler
-                    lblStatusZE.Text = "Verbindungsfehler"
+                    lblStatusZE.Text = "Serverfehler"
                    lblStatusZE.BackColor = Color.Gray
                    btnZEGehen.Enabled = False
                    btnZEKommen.Enabled = False
+                    Button2.Enabled = False
+                    btnAkten.Enabled = False

                End If

@@ -418,4 +447,9 @@ Public Class frmMitarbeitersuche
        Process.Start(webAddress)
    End Sub

+    Private Sub PictureBox5_Click(sender As Object, e As EventArgs) Handles PictureBox5.Click
+        Dim webAddress As String = "https://wiki.verag.ag/de/software/zeiterfassung/zeiterfassung"
+        Process.Start(webAddress)
+    End Sub
+
 End Class