div. Änderungen

UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb

@@ -25,6 +25,7 @@ Partial Class usrCntlMitarbeiter
         Me.components = New System.ComponentModel.Container()
         Me.Button6 = New System.Windows.Forms.Button()
         Me.Panel2 = New System.Windows.Forms.Panel()
+        Me.btnUEZ_ausz = New System.Windows.Forms.Button()
         Me.Button9 = New System.Windows.Forms.Button()
         Me.Button5 = New System.Windows.Forms.Button()
         Me.Button4 = New System.Windows.Forms.Button()
@@ -44,6 +45,8 @@ Partial Class usrCntlMitarbeiter
         Me.dgvFRONTOFFICE = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.TabPage7 = New System.Windows.Forms.TabPage()
         Me.dgvVERIMEX = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.TabPage9 = New System.Windows.Forms.TabPage()
+        Me.dgvDURMAZ = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.TabPage8 = New System.Windows.Forms.TabPage()
         Me.dgvTimasNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Panel1 = New System.Windows.Forms.Panel()
@@ -59,9 +62,7 @@ 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.Button7 = New System.Windows.Forms.Button()
+        Me.lblAktiv = New System.Windows.Forms.Label()
-        Me.TabPage9 = New System.Windows.Forms.TabPage()
-        Me.dgvDURMAZ = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Panel2.SuspendLayout()
         Me.TabControl1.SuspendLayout()
         Me.TabPage1.SuspendLayout()
@@ -78,13 +79,13 @@ Partial Class usrCntlMitarbeiter
         CType(Me.dgvFRONTOFFICE, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.TabPage7.SuspendLayout()
         CType(Me.dgvVERIMEX, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.TabPage9.SuspendLayout()
+        CType(Me.dgvDURMAZ, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.TabPage8.SuspendLayout()
         CType(Me.dgvTimasNew, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         Me.Panel3.SuspendLayout()
         Me.ContextMenuStrip1.SuspendLayout()
-        Me.TabPage9.SuspendLayout()
-        CType(Me.dgvDURMAZ, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'Button6
@@ -98,7 +99,7 @@ Partial Class usrCntlMitarbeiter
         '
         'Panel2
         '
-        Me.Panel2.Controls.Add(Me.Button7)
+        Me.Panel2.Controls.Add(Me.btnUEZ_ausz)
         Me.Panel2.Controls.Add(Me.Button9)
         Me.Panel2.Controls.Add(Me.Button6)
         Me.Panel2.Controls.Add(Me.Button5)
@@ -110,9 +111,18 @@ Partial Class usrCntlMitarbeiter
         Me.Panel2.Size = New System.Drawing.Size(92, 684)
         Me.Panel2.TabIndex = 24
         '
+        'btnUEZ_ausz
+        '
+        Me.btnUEZ_ausz.Location = New System.Drawing.Point(10, 276)
+        Me.btnUEZ_ausz.Name = "btnUEZ_ausz"
+        Me.btnUEZ_ausz.Size = New System.Drawing.Size(75, 49)
+        Me.btnUEZ_ausz.TabIndex = 22
+        Me.btnUEZ_ausz.Text = "Check ÜS-Auszahl."
+        Me.btnUEZ_ausz.UseVisualStyleBackColor = True
+        '
         'Button9
         '
-        Me.Button9.Location = New System.Drawing.Point(10, 262)
+        Me.Button9.Location = New System.Drawing.Point(9, 236)
         Me.Button9.Name = "Button9"
         Me.Button9.Size = New System.Drawing.Size(75, 34)
         Me.Button9.TabIndex = 21
@@ -320,6 +330,27 @@ Partial Class usrCntlMitarbeiter
         Me.dgvVERIMEX.Size = New System.Drawing.Size(875, 616)
         Me.dgvVERIMEX.TabIndex = 27
         '
+        'TabPage9
+        '
+        Me.TabPage9.Controls.Add(Me.dgvDURMAZ)
+        Me.TabPage9.Location = New System.Drawing.Point(4, 22)
+        Me.TabPage9.Name = "TabPage9"
+        Me.TabPage9.Padding = New System.Windows.Forms.Padding(3)
+        Me.TabPage9.Size = New System.Drawing.Size(881, 622)
+        Me.TabPage9.TabIndex = 8
+        Me.TabPage9.Text = "DURMAZ"
+        Me.TabPage9.UseVisualStyleBackColor = True
+        '
+        'dgvDURMAZ
+        '
+        Me.dgvDURMAZ.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvDURMAZ.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvDURMAZ.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.dgvDURMAZ.Location = New System.Drawing.Point(3, 3)
+        Me.dgvDURMAZ.Name = "dgvDURMAZ"
+        Me.dgvDURMAZ.Size = New System.Drawing.Size(875, 616)
+        Me.dgvDURMAZ.TabIndex = 28
+        '
         'TabPage8
         '
         Me.TabPage8.Controls.Add(Me.dgvTimasNew)
@@ -343,6 +374,7 @@ Partial Class usrCntlMitarbeiter
         '
         'Panel1
         '
+        Me.Panel1.Controls.Add(Me.lblAktiv)
         Me.Panel1.Controls.Add(Me.cbxDakosy)
         Me.Panel1.Controls.Add(Me.cbxZE)
         Me.Panel1.Controls.Add(Me.cbx)
@@ -361,7 +393,7 @@ Partial Class usrCntlMitarbeiter
         Me.cbxDakosy.AutoSize = True
         Me.cbxDakosy.Checked = True
         Me.cbxDakosy.CheckState = System.Windows.Forms.CheckState.Indeterminate
-        Me.cbxDakosy.Location = New System.Drawing.Point(798, 13)
+        Me.cbxDakosy.Location = New System.Drawing.Point(666, 11)
         Me.cbxDakosy.Name = "cbxDakosy"
         Me.cbxDakosy.Size = New System.Drawing.Size(62, 17)
         Me.cbxDakosy.TabIndex = 52
@@ -374,18 +406,18 @@ Partial Class usrCntlMitarbeiter
         Me.cbxZE.AutoSize = True
         Me.cbxZE.Checked = True
         Me.cbxZE.CheckState = System.Windows.Forms.CheckState.Indeterminate
-        Me.cbxZE.Location = New System.Drawing.Point(659, 13)
+        Me.cbxZE.Location = New System.Drawing.Point(559, 13)
         Me.cbxZE.Name = "cbxZE"
-        Me.cbxZE.Size = New System.Drawing.Size(133, 17)
+        Me.cbxZE.Size = New System.Drawing.Size(101, 17)
         Me.cbxZE.TabIndex = 51
-        Me.cbxZE.Text = "Zeiterfassung-Account"
+        Me.cbxZE.Text = "TiMAS-Account"
         Me.cbxZE.ThreeState = True
         Me.cbxZE.UseVisualStyleBackColor = True
         '
         'cbx
         '
         Me.cbx.AutoSize = True
-        Me.cbx.Location = New System.Drawing.Point(567, 13)
+        Me.cbx.Location = New System.Drawing.Point(480, 13)
         Me.cbx.Name = "cbx"
         Me.cbx.Size = New System.Drawing.Size(73, 17)
         Me.cbx.TabIndex = 25
@@ -397,12 +429,12 @@ Partial Class usrCntlMitarbeiter
         '
         Me.txtSuche.Location = New System.Drawing.Point(99, 9)
         Me.txtSuche.Name = "txtSuche"
-        Me.txtSuche.Size = New System.Drawing.Size(300, 20)
+        Me.txtSuche.Size = New System.Drawing.Size(197, 20)
         Me.txtSuche.TabIndex = 47
         '
         'Button1
         '
-        Me.Button1.Location = New System.Drawing.Point(405, 6)
+        Me.Button1.Location = New System.Drawing.Point(318, 7)
         Me.Button1.Name = "Button1"
         Me.Button1.Size = New System.Drawing.Size(75, 23)
         Me.Button1.TabIndex = 48
@@ -411,7 +443,7 @@ Partial Class usrCntlMitarbeiter
         '
         'Button2
         '
-        Me.Button2.Location = New System.Drawing.Point(486, 6)
+        Me.Button2.Location = New System.Drawing.Point(399, 7)
         Me.Button2.Name = "Button2"
         Me.Button2.Size = New System.Drawing.Size(75, 23)
         Me.Button2.TabIndex = 49
@@ -459,35 +491,13 @@ Partial Class usrCntlMitarbeiter
         Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
         Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
         '
-        'Button7
+        'lblAktiv
         '
-        Me.Button7.Location = New System.Drawing.Point(9, 325)
+        Me.lblAktiv.AutoSize = True
-        Me.Button7.Name = "Button7"
+        Me.lblAktiv.Location = New System.Drawing.Point(775, 13)
-        Me.Button7.Size = New System.Drawing.Size(75, 34)
+        Me.lblAktiv.Name = "lblAktiv"
-        Me.Button7.TabIndex = 22
+        Me.lblAktiv.Size = New System.Drawing.Size(0, 13)
-        Me.Button7.Text = "Check"
+        Me.lblAktiv.TabIndex = 53
-        Me.Button7.UseVisualStyleBackColor = True
-        '
-        'TabPage9
-        '
-        Me.TabPage9.Controls.Add(Me.dgvDURMAZ)
-        Me.TabPage9.Location = New System.Drawing.Point(4, 22)
-        Me.TabPage9.Name = "TabPage9"
-        Me.TabPage9.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage9.Size = New System.Drawing.Size(881, 622)
-        Me.TabPage9.TabIndex = 8
-        Me.TabPage9.Text = "DURMAZ"
-        Me.TabPage9.UseVisualStyleBackColor = True
-        '
-        'dgvDURMAZ
-        '
-        Me.dgvDURMAZ.AKTUALISIERUNGS_INTERVALL = -1
-        Me.dgvDURMAZ.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvDURMAZ.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.dgvDURMAZ.Location = New System.Drawing.Point(3, 3)
-        Me.dgvDURMAZ.Name = "dgvDURMAZ"
-        Me.dgvDURMAZ.Size = New System.Drawing.Size(875, 616)
-        Me.dgvDURMAZ.TabIndex = 28
         '
         'usrCntlMitarbeiter
         '
@@ -515,14 +525,14 @@ Partial Class usrCntlMitarbeiter
         CType(Me.dgvFRONTOFFICE, System.ComponentModel.ISupportInitialize).EndInit()
         Me.TabPage7.ResumeLayout(False)
         CType(Me.dgvVERIMEX, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.TabPage9.ResumeLayout(False)
+        CType(Me.dgvDURMAZ, System.ComponentModel.ISupportInitialize).EndInit()
         Me.TabPage8.ResumeLayout(False)
         CType(Me.dgvTimasNew, System.ComponentModel.ISupportInitialize).EndInit()
         Me.Panel1.ResumeLayout(False)
         Me.Panel1.PerformLayout()
         Me.Panel3.ResumeLayout(False)
         Me.ContextMenuStrip1.ResumeLayout(False)
-        Me.TabPage9.ResumeLayout(False)
-        CType(Me.dgvDURMAZ, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
 
     End Sub
@@ -564,5 +574,6 @@ Partial Class usrCntlMitarbeiter
     Friend WithEvents cbxDakosy As CheckBox
     Friend WithEvents TabPage9 As TabPage
     Friend WithEvents dgvDURMAZ As VERAG_PROG_ALLGEMEIN.MyDatagridview
-    Friend WithEvents Button7 As Button
+    Friend WithEvents btnUEZ_ausz As Button
+    Friend WithEvents lblAktiv As Label
 End Class

UID/Mitarbeiter/usrCntlMitarbeiter.vb

@@ -36,6 +36,10 @@ Public Class usrCntlMitarbeiter
     End Sub
 
     Public Sub Tabelle_anzeigen()
+
+        btnUEZ_ausz.Visible = False
+        lblAktiv.Text = ""
+
         If TabControl1.SelectedIndex = 0 Then
             showVERAGATILLA("VERAG")
         ElseIf TabControl1.SelectedIndex = 1 Then
@@ -53,17 +57,12 @@ Public Class usrCntlMitarbeiter
         ElseIf TabControl1.SelectedIndex = 7 Then
             showVERAGATILLA("DURMAZ")
         ElseIf TabControl1.SelectedIndex = 8 Then
+            btnUEZ_ausz.Visible = True
             If dgvTimasNew IsNot Nothing Then
                 showTIMAS(False)
             End If
         End If
 
-        If TabControl1.SelectedIndex = 7 Then
-            Button7.Visible = True
-        Else
-            Button7.Visible = False
-        End If
-
     End Sub
 
     Public Sub showVERAGATILLA(firma)
@@ -244,7 +243,7 @@ Public Class usrCntlMitarbeiter
             Dim dt_onlyActive As New DataTable
             dt_onlyActive = dt.Select("[Ausweis-Nr] <> 0 and Vorname <> '' and Nachname <> ''").CopyToDataTable
             dgvTimasNew.DataSource = dt_onlyActive
-
+            lblAktiv.Text = "AKTIV: " & dt_onlyActive.Rows.Count & "/" & dt.Rows.Count
             ' MsgBox("ALLE:" & dt.Rows.Count & vbNewLine & "AKIVE:" & dt_onlyActive.Rows.Count)
 
         End If
@@ -875,7 +874,7 @@ Public Class usrCntlMitarbeiter
                 Return failureDesc
             End If
 
-            API_STRING &= "/u"
+            API_String &= "/u"
 
             rest.AddHeader("Authorization", "Bearer " & API.Rows(0).Item("api_token"))
             rest.AddHeader("Content-Type", "multipart/form-data")
@@ -898,7 +897,7 @@ Public Class usrCntlMitarbeiter
             rest.AddHeader("Content-Type", "image/jpeg")
             success = rest.SetMultipartBodyStream(fileStream)
 
-            Dim responseBody As String = rest.FullRequestMultipart("POST", API_STRING)
+            Dim responseBody As String = rest.FullRequestMultipart("POST", API_String)
             If (rest.LastMethodSuccess <> True) Then
                 Debug.WriteLine(rest.LastErrorText)
                 Return rest.LastErrorText
@@ -938,7 +937,7 @@ Public Class usrCntlMitarbeiter
             dgvTimasNew.Refresh()
         End If
 
-       
+
 
         Me.Cursor = Cursors.Default
     End Sub
@@ -947,7 +946,7 @@ Public Class usrCntlMitarbeiter
         Tabelle_anzeigen()
     End Sub
 
-    Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click
+    Private Sub Button7_Click(sender As Object, e As EventArgs) Handles btnUEZ_ausz.Click
 
         If dgvTimasNew.Rows.Count = 0 Then Exit Sub
 
@@ -1042,4 +1041,6 @@ Public Class usrCntlMitarbeiter
 
 
     End Sub
+
+
 End Class