cDatenserver, StartOpt, Mitarbeiter, etc.

UID/Mitarbeiter/usrCntlMitarbeiter.vb

@@ -39,150 +39,166 @@ Public Class usrCntlMitarbeiter
     End Sub
 
     Public Sub Tabelle_anzeigen()
-        Dim startIndex As Integer = TabControl1.SelectedIndex
+        If TabControl1.SelectedIndex = 0 Then
-        Dim firmaGefunden As Boolean = False
+            showVERAGATILLA("VERAG")
-        Dim tabCount As Integer = TabControl1.TabCount
+        ElseIf TabControl1.SelectedIndex = 1 Then
-        If TabControl1.SelectedIndex <> 7 Then
+            showVERAGATILLA("ATILLA")
-            For offset As Integer = 0 To tabCount - 1
+        ElseIf TabControl1.SelectedIndex = 2 Then
-                Dim i As Integer = (startIndex + offset) Mod tabCount
+            showVERAGATILLA("IMEX")
-                Dim firma As String = ""
+        ElseIf TabControl1.SelectedIndex = 3 Then
-
+            showVERAGATILLA("UNISPED")
-                Select Case i
+        ElseIf TabControl1.SelectedIndex = 4 Then
-                    Case 0
+            showVERAGATILLA("AMBAR")
-                        firma = "VERAG"
+        ElseIf TabControl1.SelectedIndex = 5 Then
-                    Case 1
+            showVERAGATILLA("FRONTOFFICE")
-                        firma = "ATILLA"
+        ElseIf TabControl1.SelectedIndex = 6 Then
-                    Case 2
+            showVERAGATILLA("VERIMEX")
-                        firma = "IMEX"
+        ElseIf TabControl1.SelectedIndex = 7 Then
-                    Case 3
-                        firma = "UNISPED"
-                    Case 4
-                        firma = "AMBAR"
-                    Case 5
-                        firma = "FRONTOFFICE"
-                    Case 6
-                        firma = "VERIMEX"
-                End Select
-
-
-                If firma <> "" Then
-                    If showVERAGATILLA(firma) Then
-                        ' Wechsel zum Tab der gefundenen Firma
-                        TabControl1.SelectedIndex = i
-                        firmaGefunden = True
-                        Exit For
-                    End If
-                End If
-
-            Next
-        End If
-
-        If TabControl1.SelectedIndex = 7 Then
             If dgvTimasNew IsNot Nothing Then
                 showTIMAS(False)
             End If
         End If
 
-        If txtSuche.Text <> "" AndAlso TabControl1.SelectedIndex <> 7 Then
-            If Not firmaGefunden Then
-                MsgBox("Keine Daten für die ausgewählten Kriterien gefunden.", MsgBoxStyle.Information)
-            End If
-        End If
-
     End Sub
 
-
+    Public Sub showVERAGATILLA(firma)
-    Public Function showVERAGATILLA(firma As String) As Boolean
         'Paint wieder reaktivieren
         locZeilen = -1
-        If Not Grid_aktiv Then Return False
+        If Not Grid_aktiv Then Exit Sub
 
-        ' SQL-Abfrage erstellen
-        Dim sql As String = "SELECT mit_id, mit_username, mit_vname, mit_nname, mit_niederlassung, mit_abteilung, mit_email, " &
-                        "CAST(CASE WHEN mit_timasId IS NULL THEN 0 ELSE 1 END AS BIT) mit_ze, " &
-                        "CAST(CASE WHEN ISNULL([mit_DAKOSY_SB],'')<> '' AND ISNULL([mit_DAKOSY_SBFull],'')<>'' THEN 1 ELSE 0 END AS BIT) mit_DAKOSY, " &
-                        "mit_durchwahl, mit_gekuendigt, ISNULL(mit_foto_DocId,'') AS mit_foto_DocId " &
-                        "FROM tblMitarbeiter WHERE (mit_firma='" & firma & "' OR (mit_firma='ALL' AND mit_FirmaHaupt='" & firma & "'))"
 
-        ' Filter hinzufügen
+
+        Dim sql As String = "SELECT mit_id,mit_username,mit_vname, mit_nname ,mit_niederlassung,mit_abteilung,mit_email,cast (case when mit_timasId is null then 0 else 1 end as bit) mit_ze, cast (case when isnull([mit_DAKOSY_SB],'')<> '' and isnull([mit_DAKOSY_SBFull],'')<>'' then 1 else 0 end as bit) mit_DAKOSY, mit_durchwahl,mit_gekuendigt, isnull(mit_foto_DocId,'') as mit_foto_DocId  FROM tblMitarbeiter WHERE (mit_firma='" & firma & "' OR (mit_firma='ALL' AND mit_FirmaHaupt='" & firma & "' )) "
+
         If txtSuche.Text <> "" Then
             sql &= " AND (mit_username LIKE '%" & txtSuche.Text & "%' OR mit_nname LIKE '%" & txtSuche.Text & "%' OR mit_vname LIKE '%" & txtSuche.Text & "%') "
         End If
 
         If cbx.CheckState <> CheckState.Indeterminate Then
-            sql &= " AND mit_gekuendigt=" & If(cbx.Checked, 1, 0)
+            sql &= " AND mit_gekuendigt=" & IIf(cbx.Checked, 1, 0)
         End If
 
         If cbxZE.CheckState <> CheckState.Indeterminate Then
-            sql &= If(cbxZE.Checked, " AND mit_timasId IS NOT NULL", " AND mit_timasId IS NULL")
+            sql &= IIf(cbxZE.Checked, " AND mit_timasId is not null", " AND mit_timasId is null")
         End If
 
         If cbxDakosy.CheckState <> CheckState.Indeterminate Then
-            sql &= If(cbxDakosy.Checked, " AND (ISNULL([mit_DAKOSY_SB],'')<> '' AND ISNULL([mit_DAKOSY_SBFull],'')<>'')", " AND (ISNULL([mit_DAKOSY_SB],'')= '' OR ISNULL([mit_DAKOSY_SBFull],'')='')")
+            sql &= IIf(cbxDakosy.Checked, " AND (isnull([mit_DAKOSY_SB],'')<> '' AND isnull([mit_DAKOSY_SBFull],'')<>'')", " AND ((isnull([mit_DAKOSY_SB],'')= '' OR isnull([mit_DAKOSY_SBFull],'')=''))")
         End If
 
-        ' Daten laden und prüfen
+        If firma = "VERAG" Then
-        Select Case firma
+
-            Case "VERAG"
+            ' dgvVERAG.DataSource = UID.AnzeigeTabelleFirma(sql)
+
             c.SET_SQL(sql, "ADMIN")
             c.LOAD()
-                If c.RowCount > 0 Then
+            'Tabelle Kommt/Geht bereinigen
+            If c.RowCount = 0 Then
+                c.DataSource = Nothing
+            Else
                 sortDGV(c)
+                'Eintraege_festlegen()
+                'AL: Sortierung nach Ausfahrt (Zeit)
                 c.Sort(c.Columns(3), ListSortDirection.Ascending)
-                    Return True
             End If
-            Case "ATILLA"
+        ElseIf firma = "ATILLA" Then
+            ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql)
+
             dgvATILLA.SET_SQL(sql, "ADMIN")
             dgvATILLA.LOAD()
-                If dgvATILLA.RowCount > 0 Then
+
+            'Tabelle Kommt/Geht bereinigen
+            If dgvATILLA.RowCount = 0 Then
+                dgvATILLA.DataSource = Nothing
+            Else
                 sortDGV(dgvATILLA)
+                'Eintraege_festlegen()
+                'AL: Sortierung nach Ausfahrt (Zeit)
                 dgvATILLA.Sort(dgvATILLA.Columns(3), ListSortDirection.Ascending)
-                    Return True
             End If
-            Case "IMEX"
+        ElseIf firma = "IMEX" Then
+            ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql)
+
             dgvIMEX.SET_SQL(sql, "ADMIN")
             dgvIMEX.LOAD()
-                If dgvIMEX.RowCount > 0 Then
+
+            'Tabelle Kommt/Geht bereinigen
+            If dgvIMEX.RowCount = 0 Then
+                dgvIMEX.DataSource = Nothing
+            Else
                 sortDGV(dgvIMEX)
+                'Eintraege_festlegen()
+                'AL: Sortierung nach Ausfahrt (Zeit)
                 dgvIMEX.Sort(dgvIMEX.Columns(3), ListSortDirection.Ascending)
-                    Return True
             End If
-            Case "UNISPED"
+        ElseIf firma = "UNISPED" Then
+            ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql)
+
             dgvUNISPED.SET_SQL(sql, "ADMIN")
             dgvUNISPED.LOAD()
-                If dgvUNISPED.RowCount > 0 Then
+
+            'Tabelle Kommt/Geht bereinigen
+            If dgvUNISPED.RowCount = 0 Then
+                dgvUNISPED.DataSource = Nothing
+            Else
                 sortDGV(dgvUNISPED)
+                'Eintraege_festlegen()
+                'AL: Sortierung nach Ausfahrt (Zeit)
                 dgvUNISPED.Sort(dgvUNISPED.Columns(3), ListSortDirection.Ascending)
-                    Return True
             End If
-            Case "AMBAR"
+        ElseIf firma = "AMBAR" Then
+            ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql)
+
             dgvAMBAR.SET_SQL(sql, "ADMIN")
             dgvAMBAR.LOAD()
-                If dgvAMBAR.RowCount > 0 Then
+
+            'Tabelle Kommt/Geht bereinigen
+            If dgvAMBAR.RowCount = 0 Then
+                dgvAMBAR.DataSource = Nothing
+            Else
                 sortDGV(dgvAMBAR)
+                'Eintraege_festlegen()
+                'AL: Sortierung nach Ausfahrt (Zeit)
                 dgvAMBAR.Sort(dgvAMBAR.Columns(3), ListSortDirection.Ascending)
-                    Return True
             End If
-            Case "FRONTOFFICE"
+
+        ElseIf firma = "FRONTOFFICE" Then
+            ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql)
+
             dgvFRONTOFFICE.SET_SQL(sql, "ADMIN")
             dgvFRONTOFFICE.LOAD()
-                If dgvFRONTOFFICE.RowCount > 0 Then
+
+            'Tabelle Kommt/Geht bereinigen
+            If dgvFRONTOFFICE.RowCount = 0 Then
+                dgvFRONTOFFICE.DataSource = Nothing
+            Else
                 sortDGV(dgvFRONTOFFICE)
+                'Eintraege_festlegen()
+                'AL: Sortierung nach Ausfahrt (Zeit)
                 dgvFRONTOFFICE.Sort(dgvFRONTOFFICE.Columns(3), ListSortDirection.Ascending)
-                    Return True
+
             End If
-            Case "VERIMEX"
+
+
+        ElseIf firma = "VERIMEX" Then
+            ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql)
+
             dgvVERIMEX.SET_SQL(sql, "ADMIN")
             dgvVERIMEX.LOAD()
-                If dgvVERIMEX.RowCount > 0 Then
-                    sortDGV(dgvVERIMEX)
-                    dgvVERIMEX.Sort(dgvVERIMEX.Columns(3), ListSortDirection.Ascending)
-                    Return True
-                End If
-        End Select
 
-        Return False
+            'Tabelle Kommt/Geht bereinigen
-    End Function
+            If dgvVERIMEX.RowCount = 0 Then
+                dgvVERIMEX.DataSource = Nothing
+            Else
+                sortDGV(dgvVERIMEX)
+                'Eintraege_festlegen()
+                'AL: Sortierung nach Ausfahrt (Zeit)
+                dgvVERIMEX.Sort(dgvVERIMEX.Columns(3), ListSortDirection.Ascending)
+
+            End If
+        End If
+
+    End Sub
 
 
 
@@ -836,6 +852,7 @@ Public Class usrCntlMitarbeiter
                 Return rest.ResponseStatusCode & " " & rest.ResponseStatusText
             Else
                 Debug.WriteLine("File uploaded")
+                MsgBox("Bilder wurden hochgeladen")
             End If
 
             rest.ClearAllHeaders()

initATLASAufschubkonten/frmStartOptions.vb

@@ -3349,6 +3349,7 @@ Public Class frmStartOptions
                     '  VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "UID Prüfung", Body,,, False, ,, list)
                 End If
 
+
                 If setKundenvermerk Then
 
                     For Each r As DataRow In dt.Rows