TIMAS API, API, etc

2023-10-31 17:08:04 +01:00
parent 0e6f88e932
commit 7b5c593bd8
13 changed files with 1766 additions and 96 deletions
--- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
@@ -76,7 +76,6 @@ Partial Class frmMitarbDetails
        Me.Label59 = New System.Windows.Forms.Label()
        Me.TabPage6 = New System.Windows.Forms.TabPage()
        Me.TabControl1 = New System.Windows.Forms.TabControl()
-        Me.PictureBox9 = New System.Windows.Forms.PictureBox()
        Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.rtfInfoTimas = New System.Windows.Forms.RichTextBox()
        Me.btngetInfo = New System.Windows.Forms.Button()
@@ -205,6 +204,7 @@ Partial Class frmMitarbDetails
        Me.cboAdminBer = New System.Windows.Forms.ComboBox()
        Me.Label7 = New System.Windows.Forms.Label()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.btnDelete = New System.Windows.Forms.Button()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.TabControl2.SuspendLayout()
@@ -214,7 +214,6 @@ Partial Class frmMitarbDetails
        Me.TabPage4.SuspendLayout()
        Me.TabPage5.SuspendLayout()
        Me.TabPage6.SuspendLayout()
-        CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.dgvData, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.TabPage7.SuspendLayout()
        Me.GroupBox2.SuspendLayout()
@@ -804,8 +803,8 @@ Partial Class frmMitarbDetails
        '
        'TabPage6
        '
+        Me.TabPage6.Controls.Add(Me.btnDelete)
        Me.TabPage6.Controls.Add(Me.TabControl1)
-        Me.TabPage6.Controls.Add(Me.PictureBox9)
        Me.TabPage6.Controls.Add(Me.dgvData)
        Me.TabPage6.Controls.Add(Me.rtfInfoTimas)
        Me.TabPage6.Controls.Add(Me.btngetInfo)
@@ -827,15 +826,6 @@ Partial Class frmMitarbDetails
        Me.TabControl1.Size = New System.Drawing.Size(287, 145)
        Me.TabControl1.TabIndex = 122
        '
-        'PictureBox9
-        '
-        Me.PictureBox9.Location = New System.Drawing.Point(405, 3)
-        Me.PictureBox9.Name = "PictureBox9"
-        Me.PictureBox9.Size = New System.Drawing.Size(34, 27)
-        Me.PictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
-        Me.PictureBox9.TabIndex = 121
-        Me.PictureBox9.TabStop = False
-        '
        'dgvData
        '
        Me.dgvData.AKTUALISIERUNGS_INTERVALL = -1
@@ -2255,6 +2245,19 @@ Partial Class frmMitarbDetails
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
        Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
        '
+        'btnDelete
+        '
+        Me.btnDelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.btnDelete.BackColor = System.Drawing.Color.White
+        Me.btnDelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnDelete.Location = New System.Drawing.Point(384, 3)
+        Me.btnDelete.Name = "btnDelete"
+        Me.btnDelete.Size = New System.Drawing.Size(55, 26)
+        Me.btnDelete.TabIndex = 123
+        Me.btnDelete.Text = "löschen"
+        Me.btnDelete.UseVisualStyleBackColor = False
+        Me.btnDelete.Visible = False
+        '
        'frmMitarbDetails
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2284,7 +2287,6 @@ Partial Class frmMitarbDetails
        Me.TabPage5.PerformLayout()
        Me.TabPage6.ResumeLayout(False)
        Me.TabPage6.PerformLayout()
-        CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.dgvData, System.ComponentModel.ISupportInitialize).EndInit()
        Me.TabPage7.ResumeLayout(False)
        Me.GroupBox2.ResumeLayout(False)
@@ -2477,7 +2479,6 @@ Partial Class frmMitarbDetails
    Friend WithEvents btngetInfo As Button
    Friend WithEvents rtfInfoTimas As RichTextBox
    Friend WithEvents dgvData As VERAG_PROG_ALLGEMEIN.MyDatagridview
-    Friend WithEvents PictureBox9 As PictureBox
    Friend WithEvents TabControl1 As TabControl
    Friend WithEvents txtATGRNAccessCode_AT52VA6 As TextBox
    Friend WithEvents Label60 As Label
@@ -2485,4 +2486,5 @@ Partial Class frmMitarbDetails
    Friend WithEvents txtATGRNAccessCode_AT51FP7 As TextBox
    Friend WithEvents TabPage7 As TabPage
    Friend WithEvents lbSprachen As VERAG_PROG_ALLGEMEIN.MyListBox
+    Friend WithEvents btnDelete As Button
 End Class
--- a/UID/Mitarbeiter/frmMitarbDetails.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.vb
@@ -1172,6 +1172,7 @@ Public Class frmMitarbDetails

        If checkMandatoryFields() Then
            timas.createEmployee(mitarbeiter, rtfInfoTimas.Text, dtTimas)
+            If rtfInfoTimas.Visible = False AndAlso rtfInfoTimas.Text <> "" Then MsgBox(rtfInfoTimas.Text)
            tbcntr_TabIndexChanged(sender, e)
        End If

@@ -1194,6 +1195,7 @@ Public Class frmMitarbDetails
        dgvData.Visible = Not cbxTimasAngelegt.Checked
        rtfInfoTimas.Visible = cbxTimasAngelegt.Checked
        btngetInfo.Visible = cbxTimasAngelegt.Checked
+        btnDelete.Visible = cbxTimasAngelegt.Checked

    End Sub

@@ -1283,7 +1285,7 @@ Public Class frmMitarbDetails

    End Sub

-    Private Sub PictureBox9_Click_1(sender As Object, e As EventArgs) Handles PictureBox9.Click
+    Private Sub PictureBox9_Click_1(sender As Object, e As EventArgs)
        Dim webAddress As String = "https://zeit.verag.ag/"
        Process.Start(webAddress)
    End Sub
@@ -1306,6 +1308,22 @@ Public Class frmMitarbDetails

    Private isDataLoaded As Boolean = True

+    Private Sub btnDelete_Click(sender As Object, e As EventArgs) Handles btnDelete.Click
+        If Not cbxTimasAngelegt.Checked Then
+            rtfInfoTimas.Text = "Mitarbeiter nicht im Timas angelegt!"
+            Exit Sub
+        End If

+        If vbYes = MsgBox("Soll die Verknüpfung zu Timas gelöscht werden?", vbYesNoCancel) Then
+            getMitarbeiter()
+            mitarbeiter.mit_PersonalNr = DBNull.Value
+            mitarbeiter.mit_timasId = DBNull.Value
+            If UID.updateMitarbeiter(mitarbeiter) Then
+                MsgBox("Mitarbeitverknüpfung gelöscht!")
+            End If
+
+        End If
+
+    End Sub
 End Class

--- a/UID/Mitarbeiter/frmMitarbTimas.vb
+++ b/UID/Mitarbeiter/frmMitarbTimas.vb
@@ -290,7 +290,9 @@ Public Class frmMitarbTimas

                                For Each r As DataGridViewRow In dgvData.Rows
                                    For Each i As cTimasGruppe In emp.Gruppen
-                                        If r.Cells("id").Value = i.Id Then r.Cells("set").Value = True
+                                        If r.Cells("id").Value = i.Id Then
+                                            r.Cells("set").Value = True
+                                        End If
                                    Next
                                Next
                            End With
@@ -318,6 +320,24 @@ Public Class frmMitarbTimas
            dv.RowFilter = "groupType = '" & tab.Text & "'"
            dgvData.DataSource = dv
            If dgvData.Columns.Count > 0 Then
+                With dgvData
+                    .RowHeadersWidth = 10
+                    .Columns("id").Visible = True
+                    .Columns("name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+                    .Columns("groupType").Visible = False
+                    .Columns("info").Width = 200
+                    .Columns("set").Width = 20
+                    .Columns("set").HeaderText = "X"
+                    .Dock = DockStyle.Fill
+
+                    For Each r As DataGridViewRow In dgvData.Rows
+                        For Each i As cTimasGruppe In emp.Gruppen
+                            If r.Cells("id").Value = i.Id Then
+                                r.Cells("set").Value = True
+                            End If
+                        Next
+                    Next
+                End With
                tab.Controls.Add(Me.dgvData)
            End If

@@ -327,7 +347,7 @@ Public Class frmMitarbTimas

    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click

-        If vbYes = MsgBox("Möchten Sie Daten aus AVISO/SQL übernehmen?", vbYesNo) Then
+        If vbYes = MsgBox("Möchten Sie Daten aus AVISO/SDL übernehmen?", vbYesNo) Then
            If avisoEmp IsNot Nothing AndAlso avisoEmp.mit_username <> "" Then
                txtUsername.Text = avisoEmp.mit_username
                If txtInfo.Text = "" Then
@@ -336,7 +356,7 @@ Public Class frmMitarbTimas
                cbxAccount.Checked = True
                getMitarbeiter()
            Else
-                    MsgBox("Mitarbeiterdaten konnten nicht aus AVISO geladen werden!")
+                MsgBox("Mitarbeiterdaten konnten nicht aus AVISO geladen werden!")
            End If
        End If
    End Sub