div. Änderungen

2026-11-03 17:12:03 +01:00
parent a5d94dedac
commit 9d12668947
9 changed files with 175 additions and 41 deletions
--- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
@@ -85,6 +85,7 @@ Partial Class frmMitarbDetails
        Me.clInterneMailBenachrichtigungen = New System.Windows.Forms.CheckedListBox()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+        Me.PictureBox9 = New System.Windows.Forms.PictureBox()
        Me.cboFunktion = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label63 = New System.Windows.Forms.Label()
        Me.txtTelNr = New System.Windows.Forms.TextBox()
@@ -248,6 +249,7 @@ Partial Class frmMitarbDetails
        Me.TabPage6 = New System.Windows.Forms.TabPage()
        Me.Panel2 = New System.Windows.Forms.Panel()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.Label74 = New System.Windows.Forms.Label()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.TabControl2.SuspendLayout()
@@ -261,6 +263,7 @@ Partial Class frmMitarbDetails
        CType(Me.dgvUserParameter, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.tabBenachrichtigungen.SuspendLayout()
        Me.GroupBox2.SuspendLayout()
+        CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.GroupBox1.SuspendLayout()
        CType(Me.picFoto, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.TabPage3.SuspendLayout()
@@ -964,6 +967,8 @@ Partial Class frmMitarbDetails
        '
        'GroupBox2
        '
+        Me.GroupBox2.Controls.Add(Me.Label74)
+        Me.GroupBox2.Controls.Add(Me.PictureBox9)
        Me.GroupBox2.Controls.Add(Me.cboFunktion)
        Me.GroupBox2.Controls.Add(Me.Label63)
        Me.GroupBox2.Controls.Add(Me.txtTelNr)
@@ -1018,6 +1023,16 @@ Partial Class frmMitarbDetails
        Me.GroupBox2.TabStop = False
        Me.GroupBox2.Text = "Firmendaten"
        '
+        'PictureBox9
+        '
+        Me.PictureBox9.BackgroundImage = Global.ADMIN.My.Resources.Resources.email_big1
+        Me.PictureBox9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.PictureBox9.Location = New System.Drawing.Point(660, 250)
+        Me.PictureBox9.Name = "PictureBox9"
+        Me.PictureBox9.Size = New System.Drawing.Size(43, 29)
+        Me.PictureBox9.TabIndex = 116
+        Me.PictureBox9.TabStop = False
+        '
        'cboFunktion
        '
        Me.cboFunktion._allowedValuesFreiText = Nothing
@@ -2785,6 +2800,16 @@ Partial Class frmMitarbDetails
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
        Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
        '
+        'Label74
+        '
+        Me.Label74.AutoSize = True
+        Me.Label74.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label74.Location = New System.Drawing.Point(575, 250)
+        Me.Label74.Name = "Label74"
+        Me.Label74.Size = New System.Drawing.Size(79, 13)
+        Me.Label74.TabIndex = 117
+        Me.Label74.Text = "Zugangsdaten:"
+        '
        'frmMitarbDetails
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2819,6 +2844,7 @@ Partial Class frmMitarbDetails
        Me.tabBenachrichtigungen.PerformLayout()
        Me.GroupBox2.ResumeLayout(False)
        Me.GroupBox2.PerformLayout()
+        CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit()
        Me.GroupBox1.ResumeLayout(False)
        Me.GroupBox1.PerformLayout()
        CType(Me.picFoto, System.ComponentModel.ISupportInitialize).EndInit()
@@ -3063,4 +3089,6 @@ Partial Class frmMitarbDetails
    Friend WithEvents Panel2 As Panel
    Friend WithEvents Label73 As Label
    Friend WithEvents txtTimasID As TextBox
+    Friend WithEvents PictureBox9 As PictureBox
+    Friend WithEvents Label74 As Label
 End Class
--- a/UID/Mitarbeiter/frmMitarbDetails.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.vb
@@ -1,5 +1,6 @@

 Imports System.Text.RegularExpressions
+Imports System.Windows.Forms.VisualStyles.VisualStyleElement
 Imports VERAG_PROG_ALLGEMEIN

 Public Class frmMitarbDetails
@@ -1654,19 +1655,21 @@ Public Class frmMitarbDetails

        ' Sicherheitsprüfungen
        If tageProWoche <= 0 Then Return 0
-        If urlaubInStunden AndAlso wochenstunden <= 0 Then Return 0

-        Dim anspruch As Double = 0
+        Dim anspruch As Double

        If Not urlaubInStunden Then
-            ' Urlaub in Tagen
+            ' 5 Wochen Urlaub in Tagen
            anspruch = 5 * tageProWoche
        Else
-            ' Urlaub in Stunden: durchschnittliche Tagesarbeitszeit * 5
-            anspruch = (wochenstunden / tageProWoche) * 5
+            If wochenstunden <= 0 Then Return 0
+
+            ' 5 Wochen Urlaub in Stunden
+            anspruch = wochenstunden * 5
        End If

        Return Math.Round(anspruch, 2, MidpointRounding.AwayFromZero)
+
    End Function

    Private Sub TabControl2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl2.SelectedIndexChanged
@@ -1935,6 +1938,93 @@ Public Class frmMitarbDetails

        Next

+    End Sub
+
+    Private Sub PictureBox9_Click(sender As Object, e As EventArgs) Handles PictureBox9.Click
+
+        If Not cbxGekuendigt.Checked AndAlso Not mitarbeiter.mit_gekuendigt Then
+
+            ' Dim empfaenger = VERAG_PROG_ALLGEMEIN.cMitarbeiter.GetEMailRecipientForEmailNotification("Mitarbeiter-Eintritt")
+
+            Dim betreff As String = "Start Mitarbeiter " & mitarbeiter.mit_vname & " " & mitarbeiter.mit_nname & " (" & mitarbeiter.mit_firma.ToString.Replace("ALL", "VERAG") & ")"
+
+            Dim TextHTMLtable As String = ""
+
+
+            TextHTMLtable &= "Hallo " & mitarbeiter.mit_vname & "!" & "<br><br>Herzlich Willkommen bei " & mitarbeiter.mit_firma.ToString.Replace("ALL", "VERAG") & ".<br><br>"
+
+            TextHTMLtable &= "Um dir den Start so einfach wie möglich zu machen, findest du alle relevanten Informationen zum Unternehmen hier: <a href=""https://wiki.verag.ag"">WIKI</a>"
+
+            TextHTMLtable &= "<br><br>Die Zugangsdaten für deine benötigten Programme/Systeme lauten wie folgt:<br><br>"
+
+            TextHTMLtable &= "<table border=1>"
+            TextHTMLtable &= "<tr><td>Programm</td><td>Info</td><td>User</td><td>Passwort</td></tr>"
+
+
+
+            If mitarbeiter.mit_AliasAD_Username IsNot Nothing AndAlso mitarbeiter.mit_AliasAD_Username <> "" Then
+                TextHTMLtable &= "<tr>"
+                TextHTMLtable &= "<td><b>" & "Windows" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & "PC-Zugangsdaten" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_AliasAD_Username & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_pwd & "</b></td>"
+                TextHTMLtable &= "</tr>"
+            End If
+
+            If mitarbeiter.mit_username <> "" AndAlso mitarbeiter.mit_pwd <> "" Then
+                TextHTMLtable &= "<tr>"
+                TextHTMLtable &= "<td><b>" & "AVISO/SDL" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & "ERP-System" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_username & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_pwd & "</b></td>"
+                TextHTMLtable &= "</tr>"
+            End If
+
+            If mitarbeiter.mit_timasId IsNot Nothing AndAlso IsNumeric(mitarbeiter.mit_timasId) Then
+                TextHTMLtable &= "<tr>"
+                TextHTMLtable &= "<td><b>" & "TIMAS" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & "Zeiterfassung" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_username & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_pwd & "</b></td>"
+                TextHTMLtable &= "</tr>"
+            End If
+
+            If mitarbeiter.mit_DAKOSY_SB IsNot Nothing AndAlso mitarbeiter.mit_DAKOSY_SB <> "" Then
+                TextHTMLtable &= "<tr>"
+                TextHTMLtable &= "<td><b>" & "DAKOSY" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & "ZOLL-DE" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_DAKOSY_SB & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_pwd & "</b></td>"
+                TextHTMLtable &= "</tr>"
+            End If
+
+            If mitarbeiter.mit_EZOLL_SB IsNot Nothing AndAlso mitarbeiter.mit_EZOLL_SB > 0 Then
+                TextHTMLtable &= "<tr>"
+                TextHTMLtable &= "<td><b>" & "EZOLL" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & "ZOLL-AT" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_EZOLL_SB & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_pwd & "</b></td>"
+                TextHTMLtable &= "</tr>"
+            End If
+
+            If mitarbeiter.mit_CSuser IsNot Nothing AndAlso mitarbeiter.mit_CSuser <> "" Then
+                TextHTMLtable &= "<tr>"
+                TextHTMLtable &= "<td><b>" & "Creditsafe" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & "Bonitätsprüfungstool" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_CSuser & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_CSpwd & "</b></td>"
+                TextHTMLtable &= "</tr>"
+            End If
+
+
+            TextHTMLtable &= "</table>"
+
+            VERAG_PROG_ALLGEMEIN.cProgramFunctions.createMail("", betreff, TextHTMLtable)
+
+        End If
+
+
+
    End Sub
 End Class

--- a/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb
+++ b/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb
@@ -48,6 +48,7 @@ Partial Class usrCntlMitarbeiter
        Me.TabPage9 = New System.Windows.Forms.TabPage()
        Me.dgvDURMAZ = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.TabPage8 = New System.Windows.Forms.TabPage()
+        Me.lbl_Mitarbeiter_export = New System.Windows.Forms.Label()
        Me.pbMitarbeiter_export = New System.Windows.Forms.ProgressBar()
        Me.cbxTimasAktiv = New System.Windows.Forms.CheckBox()
        Me.lblTimasMandant = New System.Windows.Forms.Label()
@@ -67,7 +68,6 @@ Partial Class usrCntlMitarbeiter
        Me.UserKopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.BerechtigungenSetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.lbl_Mitarbeiter_export = New System.Windows.Forms.Label()
        Me.Panel2.SuspendLayout()
        Me.TabControl1.SuspendLayout()
        Me.TabPage1.SuspendLayout()
@@ -371,6 +371,15 @@ Partial Class usrCntlMitarbeiter
        Me.TabPage8.Text = "Zeiterfassung"
        Me.TabPage8.UseVisualStyleBackColor = True
        '
+        'lbl_Mitarbeiter_export
+        '
+        Me.lbl_Mitarbeiter_export.AutoSize = True
+        Me.lbl_Mitarbeiter_export.Location = New System.Drawing.Point(679, 8)
+        Me.lbl_Mitarbeiter_export.Name = "lbl_Mitarbeiter_export"
+        Me.lbl_Mitarbeiter_export.Size = New System.Drawing.Size(30, 13)
+        Me.lbl_Mitarbeiter_export.TabIndex = 54
+        Me.lbl_Mitarbeiter_export.Text = "0 / 0"
+        '
        'pbMitarbeiter_export
        '
        Me.pbMitarbeiter_export.Location = New System.Drawing.Point(556, 3)
@@ -532,7 +541,7 @@ Partial Class usrCntlMitarbeiter
        '
        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UserKopierenToolStripMenuItem, Me.BerechtigungenSetzenToolStripMenuItem})
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(195, 48)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(195, 70)
        '
        'UserKopierenToolStripMenuItem
        '
@@ -551,15 +560,6 @@ Partial Class usrCntlMitarbeiter
        Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
        Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
        '
-        'lbl_Mitarbeiter_export
-        '
-        Me.lbl_Mitarbeiter_export.AutoSize = True
-        Me.lbl_Mitarbeiter_export.Location = New System.Drawing.Point(679, 8)
-        Me.lbl_Mitarbeiter_export.Name = "lbl_Mitarbeiter_export"
-        Me.lbl_Mitarbeiter_export.Size = New System.Drawing.Size(30, 13)
-        Me.lbl_Mitarbeiter_export.TabIndex = 54
-        Me.lbl_Mitarbeiter_export.Text = "0 / 0"
-        '
        'usrCntlMitarbeiter
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
--- a/UID/Mitarbeiter/usrCntlMitarbeiter.vb
+++ b/UID/Mitarbeiter/usrCntlMitarbeiter.vb
@@ -1435,5 +1435,7 @@ Public Class usrCntlMitarbeiter

    End Sub

+    Private Sub MailMitZugangsdatenToolStripMenuItem_Click(sender As Object, e As EventArgs)

+    End Sub
 End Class