Timas, Kundensicherheiten fix, cbam fix, fakt (IBAN Zugferd), etc.

UID/Mitarbeiter/usrCntlMitarbeiter.vb

@@ -1,8 +1,10 @@
 Imports System.ComponentModel
+Imports System.DirectoryServices.ActiveDirectory
 Imports System.Net
 Imports System.Text
 Imports Microsoft.Office.Interop.Outlook
 Imports VERAG_PROG_ALLGEMEIN
+Imports VERAG_PROG_ALLGEMEIN.IDEV_Intrastat
 
 
 
@@ -795,7 +797,9 @@ Public Class usrCntlMitarbeiter
             Mandant = cbxClientTimas.SelectedItem.value
         End If
 
-
+        pbMitarbeiter_export.Value = 0
+        'txtPloseAnh_Einarbeitung.Text = "0 / 0"
+        'lblPloseAnh_Proz.Text = ""
 
         If item IsNot Nothing Then
             If item.Name = "uploadPuctureToWiki" Then
@@ -804,12 +808,15 @@ Public Class usrCntlMitarbeiter
             ElseIf item.Name = "copyToClipboard" Then
                 copyToClipboardWIKI()
             ElseIf item.Name = "checkue" Then
+                pbMitarbeiter_export.Visible = True
                 checkUeberstunden(False, Now().Month, Now().Year, Mandant)
 
             ElseIf item.Name = "ue_stand_yesterday" Then
+                pbMitarbeiter_export.Visible = True
                 gettimesaldo(False, Mandant)
 
             ElseIf item.Name = "ue_stand" Then
+                pbMitarbeiter_export.Visible = True
                 Dim f As New frmDatumsabfrage("Zeitsaldo-Stichtag ", True)
                 f.Label1.Text = "GS-Saldo Ende Vortag"
                 f.ShowDialog()
@@ -820,6 +827,7 @@ Public Class usrCntlMitarbeiter
 
 
             ElseIf item.Name = "ueuebersicht" Then
+                pbMitarbeiter_export.Visible = True
 
                 Dim f As New frmDatumsabfrage("Überstundenübersicht Monat ", True)
                 f.dtp_date.Format = DateTimePickerFormat.Custom
@@ -1175,9 +1183,15 @@ Public Class usrCntlMitarbeiter
                     dt_merged.Columns.Add("Nachname", GetType(String))
                     dt_merged.Columns.Add("Ausweis-Nr", GetType(Integer))
 
-                    ' Daten einfügen
+                    Dim cnt As Integer = 0
                     For Each row In query
+
                         dt_merged.Rows.Add(row)
+                        cnt += 1
+                        Dim proz As Double = (cnt / dt_merged.Rows.Count) * 100
+                        pbMitarbeiter_export.Value = proz
+                        lbl_Mitarbeiter_export.Text = cnt & " / " & dt_merged.Rows.Count
+
                     Next
 
                     If dt_merged.Rows.Count > 0 Then
@@ -1185,6 +1199,9 @@ Public Class usrCntlMitarbeiter
                             dt_merged = dt_merged.AsEnumerable().OrderByDescending(Function(r) r("value")).CopyToDataTable()
                         End If
 
+                        pbMitarbeiter_export.Value = 100
+                        lbl_Mitarbeiter_export.Text = dt_merged.Rows.Count & " / " & dt_merged.Rows.Count
+
 
                         VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt_merged,,, Info,,,,, True)
                         If dt_UES_AUS_AVISO.Rows.Count > 0 Then
@@ -1223,6 +1240,7 @@ Public Class usrCntlMitarbeiter
 
         Dim dt_Employee_temp As New DataTable
         dt_Employee_temp.Columns.Add("employeeId", GetType(Integer))
+        dt_Employee_temp.Columns.Add("Ausweis-Nr", GetType(Integer))
 
         If dgvTimasNew.SelectedRows.Count = 0 Then
             MsgBox("Bitte Mitarbeiter markieren!")
@@ -1233,6 +1251,7 @@ Public Class usrCntlMitarbeiter
 
             Dim ROW As DataRow = dt_Employee_temp.NewRow
             ROW("employeeId") = r.Cells("Id").Value
+            ROW("Ausweis-Nr") = r.Cells("Ausweis-Nr").Value
             dt_Employee_temp.Rows.Add(ROW)
 
         Next
@@ -1253,12 +1272,15 @@ Public Class usrCntlMitarbeiter
         .Nachname = emp.Field(Of String)("Nachname"),
         .Niederlassung = emp.Field(Of String)("Niederlassung"),
         .Abteilung = emp.Field(Of String)("Abteilung"),
-        .Firma = emp.Field(Of String)("Firma")
+        .Firma = emp.Field(Of String)("Firma"),
+        .Ausweis_Nr = fa.Field(Of Integer)("Ausweis-Nr")
     }
 
         Dim dt_Employee As New DataTable
 
         dt_Employee.Columns.Add("employeeId", GetType(Integer))
+        dt_Employee.Columns.Add("Ausweis-Nr", GetType(Integer))
+        dt_Employee.Columns.Add("Aktiv", GetType(Boolean))
         dt_Employee.Columns.Add("Vorname", GetType(String))
         dt_Employee.Columns.Add("Nachname", GetType(String))
         dt_Employee.Columns.Add("Niederlassung", GetType(String))
@@ -1268,21 +1290,31 @@ Public Class usrCntlMitarbeiter
         dt_Employee.Columns.Add("Saldo", GetType(Double))
 
         For Each item In query
+
+            Dim isAktiv As Boolean = False
+
+            If item.Ausweis_Nr <> 0 Then
+                isAktiv = True
+            End If
+
             dt_Employee.Rows.Add(
-        item.EmployeeId,
-        item.Vorname,
-        item.Nachname,
-        item.Niederlassung,
-        item.Abteilung,
-        item.Firma,
-        DBNull.Value,  ' Saldo-raw
-        DBNull.Value  ' Saldo
+            item.EmployeeId,
+            item.Ausweis_Nr,
+            isAktiv,
+            item.Vorname,
+            item.Nachname,
+            item.Niederlassung,
+            item.Abteilung,
+            item.Firma,
+            DBNull.Value,  ' Saldo-raw
+            DBNull.Value  ' Saldo
     )
         Next
 
         Dim emp_id_all As Integer = -1
         Dim saldo As String = ""
         Dim saldoDouble As Double
+        Dim cnt As Integer = 0
 
         For Each r As DataRow In dt_Employee.Rows
 
@@ -1332,6 +1364,11 @@ Public Class usrCntlMitarbeiter
 
             End If
 
+            cnt += 1
+            Dim proz As Double = (cnt / dgvTimasNew.SelectedRows.Count) * 100
+            pbMitarbeiter_export.Value = proz
+            lbl_Mitarbeiter_export.Text = cnt & " / " & dgvTimasNew.SelectedRows.Count
+            My.Application.DoEvents()
 
         Next
 
@@ -1339,6 +1376,10 @@ Public Class usrCntlMitarbeiter
             VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt_Employee,,, IIf(TimasMandant <> "", "", "Mandant: ") & TimasMandant & " Stundensaldo zum " & IIf(stichtag, st_datum.ToShortDateString, Now.AddDays(-1).ToShortDateString),,,,, True)
         End If
 
+        pbMitarbeiter_export.Value = 100
+        lbl_Mitarbeiter_export.Text = dgvTimasNew.SelectedRows.Count & " / " & dgvTimasNew.SelectedRows.Count
+
+
     End Sub
 
     Private Sub cbxClientTimas_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbxClientTimas.SelectedIndexChanged, cbxTimasAktiv.CheckStateChanged
@@ -1388,6 +1429,11 @@ Public Class usrCntlMitarbeiter
             showTIMAS(False, STATUS)
         End If
 
+        pbMitarbeiter_export.Value = 0
+        lbl_Mitarbeiter_export.Text = "0 / 0"
+
 
     End Sub
+
+
 End Class